diff options
Diffstat (limited to 'include/linux/ethtool.h')
| -rw-r--r-- | include/linux/ethtool.h | 24 | 
1 files changed, 21 insertions, 3 deletions
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h index cca1c3de140..b33f316bb92 100644 --- a/include/linux/ethtool.h +++ b/include/linux/ethtool.h @@ -61,6 +61,13 @@ struct ethtool_drvinfo {  				/* For PCI devices, use pci_name(pci_dev). */  	char	reserved1[32];  	char	reserved2[12]; +				/* +				 * Some struct members below are filled in +				 * using ops->get_sset_count().  Obtaining +				 * this info from ethtool_drvinfo is now +				 * deprecated; Use ETHTOOL_GSSET_INFO +				 * instead. +				 */  	__u32	n_priv_flags;	/* number of flags valid in ETHTOOL_GPFLAGS */  	__u32	n_stats;	/* number of u64's from ETHTOOL_GSTATS */  	__u32	testinfo_len; @@ -253,6 +260,17 @@ struct ethtool_gstrings {  	__u8	data[0];  }; +struct ethtool_sset_info { +	__u32	cmd;		/* ETHTOOL_GSSET_INFO */ +	__u32	reserved; +	__u64	sset_mask;	/* input: each bit selects an sset to query */ +				/* output: each bit a returned sset */ +	__u32	data[0];	/* ETH_SS_xxx count, in order, based on bits +				   in sset_mask.  One bit implies one +				   __u32, two bits implies two +				   __u32's, etc. */ +}; +  enum ethtool_test_flags {  	ETH_TEST_FL_OFFLINE	= (1 << 0),	/* online / offline */  	ETH_TEST_FL_FAILED	= (1 << 1),	/* test passed / failed */ @@ -606,9 +624,9 @@ struct ethtool_ops {  #define	ETHTOOL_SRXCLSRLINS	0x00000032 /* Insert RX classification rule */  #define	ETHTOOL_FLASHDEV	0x00000033 /* Flash firmware to device */  #define	ETHTOOL_RESET		0x00000034 /* Reset hardware */ - -#define ETHTOOL_SRXNTUPLE	0x00000035 /* Add an n-tuple filter to device */ -#define ETHTOOL_GRXNTUPLE	0x00000036 /* Get n-tuple filters from device */ +#define	ETHTOOL_SRXNTUPLE	0x00000035 /* Add an n-tuple filter to device */ +#define	ETHTOOL_GRXNTUPLE	0x00000036 /* Get n-tuple filters from device */ +#define	ETHTOOL_GSSET_INFO	0x00000037 /* Get string set info */  /* compatibility with older code */  #define SPARC_ETH_GSET		ETHTOOL_GSET  |