Revert "ethtool: Add n-tuple string length to drvinfo and return it"
David S. Miller [Fri, 26 Feb 2010 13:12:02 +0000 (05:12 -0800)]
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>

include/linux/ethtool.h
net/core/ethtool.c

index f7992a2..cca1c3d 100644 (file)
@@ -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) */
index 1c94f48..31b1edd 100644 (file)
@@ -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);