aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@redhat.com>2010-03-03 17:51:50 -0500
committerDavid S. Miller <davem@davemloft.net>2010-03-05 17:00:17 -0500
commit723b2f57ad83ee7087acf9a95e8e289414b1f521 (patch)
treee8120bff2899245d2c84905b1368a128bf881268 /include/linux
parent4b79a1aedcb9dd6e3f27b970dcb553aefcd97254 (diff)
ethtool: Add direct access to ops->get_sset_count
This patch is an alternative approach for accessing string counts, vs. the drvinfo indirect approach. This way the drvinfo space doesn't run out, and we don't break ABI later. Signed-off-by: Jeff Garzik <jgarzik@redhat.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/ethtool.h17
1 files changed, 14 insertions, 3 deletions
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index cca1c3de140d..f6f961fefbe5 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -253,6 +253,17 @@ struct ethtool_gstrings {
253 __u8 data[0]; 253 __u8 data[0];
254}; 254};
255 255
256struct ethtool_sset_info {
257 __u32 cmd; /* ETHTOOL_GSSET_INFO */
258 __u32 reserved;
259 __u64 sset_mask; /* input: each bit selects an sset to query */
260 /* output: each bit a returned sset */
261 __u32 data[0]; /* ETH_SS_xxx count, in order, based on bits
262 in sset_mask. One bit implies one
263 __u32, two bits implies two
264 __u32's, etc. */
265};
266
256enum ethtool_test_flags { 267enum ethtool_test_flags {
257 ETH_TEST_FL_OFFLINE = (1 << 0), /* online / offline */ 268 ETH_TEST_FL_OFFLINE = (1 << 0), /* online / offline */
258 ETH_TEST_FL_FAILED = (1 << 1), /* test passed / failed */ 269 ETH_TEST_FL_FAILED = (1 << 1), /* test passed / failed */
@@ -606,9 +617,9 @@ struct ethtool_ops {
606#define ETHTOOL_SRXCLSRLINS 0x00000032 /* Insert RX classification rule */ 617#define ETHTOOL_SRXCLSRLINS 0x00000032 /* Insert RX classification rule */
607#define ETHTOOL_FLASHDEV 0x00000033 /* Flash firmware to device */ 618#define ETHTOOL_FLASHDEV 0x00000033 /* Flash firmware to device */
608#define ETHTOOL_RESET 0x00000034 /* Reset hardware */ 619#define ETHTOOL_RESET 0x00000034 /* Reset hardware */
609 620#define ETHTOOL_SRXNTUPLE 0x00000035 /* Add an n-tuple filter to device */
610#define ETHTOOL_SRXNTUPLE 0x00000035 /* Add an n-tuple filter to device */ 621#define ETHTOOL_GRXNTUPLE 0x00000036 /* Get n-tuple filters from device */
611#define ETHTOOL_GRXNTUPLE 0x00000036 /* Get n-tuple filters from device */ 622#define ETHTOOL_GSSET_INFO 0x00000037 /* Get string set info */
612 623
613/* compatibility with older code */ 624/* compatibility with older code */
614#define SPARC_ETH_GSET ETHTOOL_GSET 625#define SPARC_ETH_GSET ETHTOOL_GSET