Commit 1c6e8088 authored by Clément Léger's avatar Clément Léger Committed by David S. Miller
Browse files

net: dsa: allow port_bridge_join() to override extack message 



Some drivers might report that they are unable to bridge ports by
returning -EOPNOTSUPP, but still wants to override extack message.
In order to do so, in dsa_slave_changeupper(), if port_bridge_join()
returns -EOPNOTSUPP, check if extack message is set and if so, do not
override it.

Signed-off-by: default avatarClément Léger <clement.leger@bootlin.com>
Reviewed-by: default avatarVladimir Oltean <olteanv@gmail.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ebeae54d

net/dsa/slave.c

+3 −2
Original line number Diff line number Diff line
@@ -2460,6 +2460,7 @@ static int dsa_slave_changeupper(struct net_device *dev, 
			if (!err)

				dsa_bridge_mtu_normalization(dp);

			if (err == -EOPNOTSUPP) {

				if (!extack->_msg)

					NL_SET_ERR_MSG_MOD(extack,

							   "Offloading not supported");

				err = 0;