Commit 738b0343 authored by David S. Miller's avatar David S. Miller

Revert "ethtool: Add n-tuple string length to drvinfo and return it"

This reverts commit c79c5ffd.

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: default avatarDavid S. Miller <davem@davemloft.net>
parent 14f3ad6f
...@@ -63,7 +63,6 @@ struct ethtool_drvinfo { ...@@ -63,7 +63,6 @@ struct ethtool_drvinfo {
char reserved2[12]; char reserved2[12];
__u32 n_priv_flags; /* number of flags valid in ETHTOOL_GPFLAGS */ __u32 n_priv_flags; /* number of flags valid in ETHTOOL_GPFLAGS */
__u32 n_stats; /* number of u64's from ETHTOOL_GSTATS */ __u32 n_stats; /* number of u64's from ETHTOOL_GSTATS */
__u32 n_ntuples; /* number of n-tuple filters from GSTRINGS */
__u32 testinfo_len; __u32 testinfo_len;
__u32 eedump_len; /* Size of data from ETHTOOL_GEEPROM (bytes) */ __u32 eedump_len; /* Size of data from ETHTOOL_GEEPROM (bytes) */
__u32 regdump_len; /* Size of data from ETHTOOL_GREGS (bytes) */ __u32 regdump_len; /* Size of data from ETHTOOL_GREGS (bytes) */
......
...@@ -224,9 +224,6 @@ static noinline int ethtool_get_drvinfo(struct net_device *dev, void __user *use ...@@ -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); rc = ops->get_sset_count(dev, ETH_SS_PRIV_FLAGS);
if (rc >= 0) if (rc >= 0)
info.n_priv_flags = rc; 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) if (ops->get_regs_len)
info.regdump_len = ops->get_regs_len(dev); info.regdump_len = ops->get_regs_len(dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment