[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20231214142136.17564-1-ante.knezic@helmholz.de>
Date: Thu, 14 Dec 2023 15:21:36 +0100
From: Ante Knezic <ante.knezic@...mholz.de>
To: <netdev@...r.kernel.org>
CC: <andrew@...n.ch>, <f.fainelli@...il.com>, <olteanv@...il.com>,
<davem@...emloft.net>, <edumazet@...gle.com>, <kuba@...nel.org>,
<pabeni@...hat.com>, <linux-kernel@...r.kernel.org>, Ante Knezic
<ante.knezic@...mholz.de>
Subject: [PATCH net-next] net: dsa: dont use generic selftest strings for custom selftests
if dsa device supports custom selftests than we should use custom
selftest strings for ethtool.
Signed-off-by: Ante Knezic <ante.knezic@...mholz.de>
---
net/dsa/user.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/net/dsa/user.c b/net/dsa/user.c
index d438884a4eb0..d0e0d1a2bff7 100644
--- a/net/dsa/user.c
+++ b/net/dsa/user.c
@@ -1072,7 +1072,11 @@ static void dsa_user_get_strings(struct net_device *dev,
ds->ops->get_strings(ds, dp->index, stringset,
data + 4 * len);
} else if (stringset == ETH_SS_TEST) {
- net_selftest_get_strings(data);
+ if (ds->ops->self_test && ds->ops->get_strings)
+ ds->ops->get_strings(ds, dp->index, stringset,
+ data);
+ else
+ net_selftest_get_strings(data);
}
}
@@ -1123,7 +1127,10 @@ static int dsa_user_get_sset_count(struct net_device *dev, int sset)
return count + 4;
} else if (sset == ETH_SS_TEST) {
- return net_selftest_get_count();
+ if (ds->ops->self_test && ds->ops->get_sset_count)
+ return ds->ops->get_sset_count(ds, dp->index, sset);
+ else
+ return net_selftest_get_count();
}
return -EOPNOTSUPP;
--
2.11.0
Powered by blists - more mailing lists