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

Commit d61d263c authored Mar 15, 2018 by Matthias Brugger Committed by David S. Miller Mar 17, 2018

net: hns: Fix ethtool private flags



The driver implementation returns support for private flags, while
no private flags are present. When asked for the number of private
flags it returns the number of statistic flag names.

Fix this by returning EOPNOTSUPP for not implemented ethtool flags.

Signed-off-by: Matthias Brugger <mbrugger@suse.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent bcdd5de8

drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -666,7 +666,7 @@ static void hns_gmac_get_strings(u32 stringset, u8 *data)

		static int hns_gmac_get_sset_count(int stringset)
		{
		if (stringset == ETH_SS_STATS \|\| stringset == ETH_SS_PRIV_FLAGS)
		if (stringset == ETH_SS_STATS)
		return ARRAY_SIZE(g_gmac_stats_string);

		return 0;

drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -422,7 +422,7 @@ void hns_ppe_update_stats(struct hns_ppe_cb *ppe_cb)

		int hns_ppe_get_sset_count(int stringset)
		{
		if (stringset == ETH_SS_STATS \|\| stringset == ETH_SS_PRIV_FLAGS)
		if (stringset == ETH_SS_STATS)
		return ETH_PPE_STATIC_NUM;
		return 0;
		}

drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -876,7 +876,7 @@ void hns_rcb_get_stats(struct hnae_queue queue, u64 data)
		*/
		int hns_rcb_get_ring_sset_count(int stringset)
		{
		if (stringset == ETH_SS_STATS \|\| stringset == ETH_SS_PRIV_FLAGS)
		if (stringset == ETH_SS_STATS)
		return HNS_RING_STATIC_REG_NUM;

		return 0;

drivers/net/ethernet/hisilicon/hns/hns_ethtool.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -993,8 +993,10 @@ int hns_get_sset_count(struct net_device *netdev, int stringset)
		cnt--;

		return cnt;
		} else {
		} else if (stringset == ETH_SS_STATS) {
		return (HNS_NET_STATS_CNT + ops->get_sset_count(h, stringset));
		} else {
		return -EOPNOTSUPP;
		}
		}