[PATCH] net: add unknown state to sysfs NIC duplex export

Subsystems: networking [general], the rest

STALE5117d

2 messages, 2 authors, 2012-09-05 · open the first message on its own page

[PATCH] net: add unknown state to sysfs NIC duplex export

From: Nikolay Aleksandrov <hidden>
Date: 2012-09-05 14:12:47

 Currently when the NIC duplex state is DUPLEX_UNKNOWN it is exported as
 full through sysfs, this patch adds support for DUPLEX_UNKNOWN. It is
 handled the same way as in ethtool.

 Signed-off-by: Nikolay Aleksandrov [off-list ref]
---
 net/core/net-sysfs.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 7260717..7720fb1 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -166,9 +166,21 @@ static ssize_t show_duplex(struct device *dev,
 
 	if (netif_running(netdev)) {
 		struct ethtool_cmd cmd;
-		if (!__ethtool_get_settings(netdev, &cmd))
-			ret = sprintf(buf, "%s\n",
-				      cmd.duplex ? "full" : "half");
+		if (!__ethtool_get_settings(netdev, &cmd)) {
+			char *duplex;
+			switch(cmd.duplex) {
+			case DUPLEX_HALF:
+				duplex = "half";
+				break;
+			case DUPLEX_FULL:
+				duplex = "full";
+				break;
+			default:
+				duplex = "unknown";
+				break;
+			}
+			ret = sprintf(buf, "%s\n", duplex);
+		}
 	}
 	rtnl_unlock();
 	return ret;
-- 
1.7.11.4

Re: [PATCH] net: add unknown state to sysfs NIC duplex export

From: David Miller <davem@davemloft.net>
Date: 2012-09-05 21:40:56

From: Nikolay Aleksandrov <redacted>
Date: Wed,  5 Sep 2012 16:11:28 +0200
 Currently when the NIC duplex state is DUPLEX_UNKNOWN it is exported as
 full through sysfs, this patch adds support for DUPLEX_UNKNOWN. It is
 handled the same way as in ethtool.

 Signed-off-by: Nikolay Aleksandrov [off-list ref]
Applied with two minor corrections:
+			char *duplex;
I made this "const char *"
+			switch(cmd.duplex) {
I added the missing space between 'switch' and '(cmd.duplex)'.

Thanks.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help