aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorOleksij Rempel <o.rempel@pengutronix.de>2021-04-21 15:05:40 +0200
committerDavid S. Miller <davem@davemloft.net>2021-04-21 10:47:27 -0700
commit70a7c484c7c3eaa17b679db2c74ec8ecbe8dc0e8 (patch)
tree52360aea460d2c5bf9403f624b3ab723b42097f6
parentstmmac: intel: unlock on error path in intel_crosststamp() (diff)
downloadwireguard-linux-70a7c484c7c3eaa17b679db2c74ec8ecbe8dc0e8.tar.xz
wireguard-linux-70a7c484c7c3eaa17b679db2c74ec8ecbe8dc0e8.zip
net: dsa: fix bridge support for drivers without port_bridge_flags callback
Starting with patch: a8b659e7ff75 ("net: dsa: act as passthrough for bridge port flags") drivers without "port_bridge_flags" callback will fail to join the bridge. Looking at the code, -EOPNOTSUPP seems to be the proper return value, which makes at least microchip and atheros switches work again. Fixes: 5961d6a12c13 ("net: dsa: inherit the actual bridge port flags at join time") Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/dsa/port.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dsa/port.c b/net/dsa/port.c
index 01e30264b25b..6379d66a6bb3 100644
--- a/net/dsa/port.c
+++ b/net/dsa/port.c
@@ -550,7 +550,7 @@ int dsa_port_bridge_flags(const struct dsa_port *dp,
struct dsa_switch *ds = dp->ds;
if (!ds->ops->port_bridge_flags)
- return -EINVAL;
+ return -EOPNOTSUPP;
return ds->ops->port_bridge_flags(ds, dp->index, flags, extack);
}