From 85a95bca62515fd2636ee400eb50d8f8568c8810 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Fri, 26 Feb 2010 05:12:02 -0800 Subject: [PATCH] --- yaml --- r: 184526 b: refs/heads/master c: 738b0343e73604750feb107e063c28b3ca36cb84 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/ethtool.h | 1 - trunk/net/core/ethtool.c | 3 --- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index de62d5940aac..a67c2b076a3f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 14f3ad6f4a12495b32b0dd743bc7179f36658208 +refs/heads/master: 738b0343e73604750feb107e063c28b3ca36cb84 diff --git a/trunk/include/linux/ethtool.h b/trunk/include/linux/ethtool.h index f7992a256b71..cca1c3de140d 100644 --- a/trunk/include/linux/ethtool.h +++ b/trunk/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/trunk/net/core/ethtool.c b/trunk/net/core/ethtool.c index 1c94f48e27b5..31b1eddc1b84 100644 --- a/trunk/net/core/ethtool.c +++ b/trunk/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);