diff options
| author | Peter Waskiewicz <peter.p.waskiewicz.jr@intel.com> | 2010-03-04 00:53:29 -0800 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2010-03-30 13:10:46 -0400 |
| commit | 342a43f41eacba0de740aa2a43f34da12f4945a6 (patch) | |
| tree | e882ff3ab575e228e298acf8d976e1dd073d91e0 /ethtool-copy.h | |
| parent | 4e9fa76fc88785cfee364be371ea3b341c2274ee (diff) | |
| download | ethtool-342a43f41eacba0de740aa2a43f34da12f4945a6.tar.gz | |
ethtool: Correctly pull n-tuple string length for get_rx_ntuple
This patch fixes inconsistencies with the kernel header files, while
correctly gets the variable length string counts for the get_rx_ntuple
return value. It does this by using the new GSSET_INFO ioctl.
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: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'ethtool-copy.h')
| -rw-r--r-- | ethtool-copy.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/ethtool-copy.h b/ethtool-copy.h index 8681f5e..3b4128e 100644 --- a/ethtool-copy.h +++ b/ethtool-copy.h @@ -253,6 +253,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 */ @@ -389,8 +400,6 @@ struct ethtool_rx_ntuple_flow_spec { #define ETHTOOL_RXNTUPLE_ACTION_DROP -1 }; -#define ETHTOOL_MAX_NTUPLE_LIST_ENTRY 1024 -#define ETHTOOL_MAX_NTUPLE_STRING_PER_ENTRY 14 struct ethtool_rx_ntuple { __u32 cmd; struct ethtool_rx_ntuple_flow_spec fs; @@ -466,6 +475,7 @@ struct ethtool_flash { #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 |