Skip to contentSkip to conversation

net: dsa: sja1105: Don't return a negative in u8 sja1105_stp_state_get

PATCH Applied Vladimir Oltean 2 participants 2 messages May 8, 2019

Subsystems (5)
lore
Share & tools
lore

Vladimir Oltean

author maintainer
#0 lore raw

PATCH 1/1 net: dsa: sja1105: Don't return a negative in u8 sja1105_stp_state_get

Dan Carpenter says:

The patch 640f763f98c2: "net: dsa: sja1105: Add support for Spanning Tree Protocol" from May 5, 2019, leads to the following static checker warning:

drivers/net/dsa/sja1105/sja1105_main.c:1073 sja1105_stp_state_get()
warn: signedness bug returning '(-22)'

The caller doesn't check for negative errors anyway.

Fixes 640f763f98c2: ("net: dsa: sja1105: Add support for Spanning Tree Protocol")
---
 drivers/net/dsa/sja1105/sja1105_main.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/dsa/sja1105/sja1105_main.c +5 -1
index 4ccdbc80f7be..46f76b4c5618 100644
@@ -1124,7 +1124,11 @@ static u8 sja1105_stp_state_get(struct sja1105_private *priv, int port)
 		return BR_STATE_LEARNING;
 	if (mac[port].ingress && mac[port].egress && mac[port].dyn_learn)
 		return BR_STATE_FORWARDING;
-	return -EINVAL;
+	/* This is really an error condition if the MAC was in none of the STP
+	 * states above. But treating the port as disabled does nothing, which
+	 * is adequate, and it also resets the MAC to a known state later on.
+	 */
+	return BR_STATE_DISABLED;
 }
 
 /* For situations where we need to change a setting at runtime that is only
Signature · 1 line
2.17.1
maintainer Applied
#1 lore raw

From: Vladimir Oltean <[email protected]>
Date: Wed, 8 May 2019 23:32:25 +0300

Quoted 6 lines

Dan Carpenter says:

The patch 640f763f98c2: "net: dsa: sja1105: Add support for Spanning Tree Protocol" from May 5, 2019, leads to the following static checker warning:

Quoted 8 lines

drivers/net/dsa/sja1105/sja1105_main.c:1073 sja1105_stp_state_get()
warn: signedness bug returning '(-22)'

The caller doesn't check for negative errors anyway.

Fixes 640f763f98c2: ("net: dsa: sja1105: Add support for Spanning Tree Protocol")

Applied.