[ethtool] fix ethtool_get_strings counting bug

662222ae · Matthew Wilcox · Jeff Garzik · dc94c230 · 662222ae
Commit 662222ae authored Aug 27, 2003 by Matthew Wilcox Committed by Jeff Garzik Aug 27, 2003
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

net/core/ethtool.c net/core/ethtool.c +6 -6

No files found.
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -502,15 +502,15 @@ static int ethtool_get_strings(struct net_device *dev, void *useraddr)

 	switch (gstrings.string_set) {
 	case ETH_SS_TEST:
-		if (ops->self_test_count)
-			gstrings.len = ops->self_test_count(dev);
-		else
+		if (!ops->self_test_count)
 			return -EOPNOTSUPP;
+		gstrings.len = ops->self_test_count(dev);
+		break;
 	case ETH_SS_STATS:
-		if (ops->get_stats_count)
-			gstrings.len = ops->get_stats_count(dev);
-		else
+		if (!ops->get_stats_count)
 			return -EOPNOTSUPP;
+		gstrings.len = ops->get_stats_count(dev);
+		break;
 	default:
 		return -EINVAL;
 	}