aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/ethtool.h1
-rw-r--r--net/core/ethtool.c3
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 {
63 char reserved2[12]; 63 char reserved2[12];
64 __u32 n_priv_flags; /* number of flags valid in ETHTOOL_GPFLAGS */ 64 __u32 n_priv_flags; /* number of flags valid in ETHTOOL_GPFLAGS */
65 __u32 n_stats; /* number of u64's from ETHTOOL_GSTATS */ 65 __u32 n_stats; /* number of u64's from ETHTOOL_GSTATS */
66 __u32 n_ntuples; /* number of n-tuple filters from GSTRINGS */
67 __u32 testinfo_len; 66 __u32 testinfo_len;
68 __u32 eedump_len; /* Size of data from ETHTOOL_GEEPROM (bytes) */ 67 __u32 eedump_len; /* Size of data from ETHTOOL_GEEPROM (bytes) */
69 __u32 regdump_len; /* Size of data from ETHTOOL_GREGS (bytes) */ 68 __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
224 rc = ops->get_sset_count(dev, ETH_SS_PRIV_FLAGS); 224 rc = ops->get_sset_count(dev, ETH_SS_PRIV_FLAGS);
225 if (rc >= 0) 225 if (rc >= 0)
226 info.n_priv_flags = rc; 226 info.n_priv_flags = rc;
227 rc = ops->get_sset_count(dev, ETH_SS_NTUPLE_FILTERS);
228 if (rc >= 0)
229 info.n_ntuples = rc;
230 } 227 }
231 if (ops->get_regs_len) 228 if (ops->get_regs_len)
232 info.regdump_len = ops->get_regs_len(dev); 229 info.regdump_len = ops->get_regs_len(dev);