diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-26 14:12:02 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-26 14:12:02 +0100 |
| commit | 738b0343e73604750feb107e063c28b3ca36cb84 (patch) | |
| tree | d288246dd868c20a1c80eaec0c8f20c5a28a2cbc | |
| parent | ipv6: Use 1280 as min MTU for ipv6 forwarding (diff) | |
| download | linux-738b0343e73604750feb107e063c28b3ca36cb84.tar.xz linux-738b0343e73604750feb107e063c28b3ca36cb84.zip | |
Revert "ethtool: Add n-tuple string length to drvinfo and return it"
This reverts commit c79c5ffdce14abb4de3878c5aa8c3c6e5093c69b.
As Jeff points out we can't break the user visible interface
like this, we need to add this into the reserved[] thing.
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/linux/ethtool.h | 1 | ||||
| -rw-r--r-- | net/core/ethtool.c | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h index f7992a256b71..cca1c3de140d 100644 --- a/include/linux/ethtool.h +++ b/include/linux/ethtool.h @@ -63,7 +63,6 @@ struct ethtool_drvinfo { char reserved2[12]; __u32 n_priv_flags; /* number of flags valid in ETHTOOL_GPFLAGS */ __u32 n_stats; /* number of u64's from ETHTOOL_GSTATS */ - __u32 n_ntuples; /* number of n-tuple filters from GSTRINGS */ __u32 testinfo_len; __u32 eedump_len; /* Size of data from ETHTOOL_GEEPROM (bytes) */ __u32 regdump_len; /* Size of data from ETHTOOL_GREGS (bytes) */ diff --git a/net/core/ethtool.c b/net/core/ethtool.c index 1c94f48e27b5..31b1eddc1b84 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -224,9 +224,6 @@ static noinline int ethtool_get_drvinfo(struct net_device *dev, void __user *use rc = ops->get_sset_count(dev, ETH_SS_PRIV_FLAGS); if (rc >= 0) info.n_priv_flags = rc; - rc = ops->get_sset_count(dev, ETH_SS_NTUPLE_FILTERS); - if (rc >= 0) - info.n_ntuples = rc; } if (ops->get_regs_len) info.regdump_len = ops->get_regs_len(dev); |