Commit bbe14f54 authored Nov 13, 2015 by Ido Schimmel Committed by David S. Miller Nov 16, 2015

switchdev: bridge: Check return code is not EOPNOTSUPP



When NET_SWITCHDEV=n, switchdev_port_attr_set simply returns EOPNOTSUPP.
In this case we should not emit errors and warnings to the kernel log.

Reported-by: Sander Eikelenboom <linux@eikelenboom.it>
Tested-by: Christian Borntraeger <borntraeger@de.ibm.com>
Fixes: 0bc05d58 ("switchdev: allow caller to explicitly request
attr_set as deferred")
Fixes: 6ac311ae ("Adding switchdev ageing notification on port
bridged")
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent d5d30981

net/bridge/br_stp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ void br_set_state(struct net_bridge_port *p, unsigned int state)

		p->state = state;
		err = switchdev_port_attr_set(p->dev, &attr);
		if (err)
		if (err && err != -EOPNOTSUPP)
		br_warn(p->br, "error setting offload STP state on port %u(%s)\n",
		(unsigned int) p->port_no, p->dev->name);
		}

net/bridge/br_stp_if.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ void br_init_port(struct net_bridge_port *p)
		p->config_pending = 0;

		err = switchdev_port_attr_set(p->dev, &attr);
		if (err)
		if (err && err != -EOPNOTSUPP)
		netdev_err(p->dev, "failed to set HW ageing time\n");
		}

Admin message