Skip to content

Commit

Permalink
Revert "ethtool: Add n-tuple string length to drvinfo and return it"
Browse files Browse the repository at this point in the history
This reverts commit c79c5ff.

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>
  • Loading branch information
davem330 committed Feb 26, 2010
1 parent 14f3ad6 commit 738b034
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 4 deletions.
1 change: 0 additions & 1 deletion include/linux/ethtool.h
Original file line number Diff line number Diff line change
Expand Up @@ -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) */
Expand Down
3 changes: 0 additions & 3 deletions net/core/ethtool.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 738b034

Please sign in to comment.