Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

include/linux/ethtool.h

+0 −1
Original line number Diff line number Diff line
@@ -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) */

net/core/ethtool.c

+0 −3
Original line number Diff line number Diff line
@@ -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);