Commit 419dba8a authored by Horatiu Vultur's avatar Horatiu Vultur Committed by David S. Miller
Browse files

net: bridge: Add checks for enabling the STP. 



It is not possible to have the MRP and STP running at the same time on the
bridge, therefore add check when enabling the STP to check if MRP is already
enabled. In that case return error.

Reviewed-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarHoratiu Vultur <horatiu.vultur@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 65369933

net/bridge/br_ioctl.c

+1 −2
Original line number Diff line number Diff line
@@ -242,8 +242,7 @@ static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) 
		if (!ns_capable(dev_net(dev)->user_ns, CAP_NET_ADMIN))

			return -EPERM;



		br_stp_set_enabled(br, args[1]);

		ret = 0;

		ret = br_stp_set_enabled(br, args[1], NULL);

		break;



	case BRCTL_SET_BRIDGE_PRIORITY:

net/bridge/br_netlink.c

+3 −1
Original line number Diff line number Diff line
@@ -1109,7 +1109,9 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[], 
	if (data[IFLA_BR_STP_STATE]) {

		u32 stp_enabled = nla_get_u32(data[IFLA_BR_STP_STATE]);



		br_stp_set_enabled(br, stp_enabled);

		err = br_stp_set_enabled(br, stp_enabled, extack);

		if (err)

			return err;

	}



	if (data[IFLA_BR_PRIORITY]) {

net/bridge/br_private.h

+2 −1
Original line number Diff line number Diff line
@@ -1283,7 +1283,8 @@ int br_set_ageing_time(struct net_bridge *br, clock_t ageing_time); 
/* br_stp_if.c */

void br_stp_enable_bridge(struct net_bridge *br);

void br_stp_disable_bridge(struct net_bridge *br);

void br_stp_set_enabled(struct net_bridge *br, unsigned long val);

int br_stp_set_enabled(struct net_bridge *br, unsigned long val,

		       struct netlink_ext_ack *extack);

void br_stp_enable_port(struct net_bridge_port *p);

void br_stp_disable_port(struct net_bridge_port *p);

bool br_stp_recalculate_bridge_id(struct net_bridge *br);

net/bridge/br_stp.c

+6 −0
Original line number Diff line number Diff line
@@ -36,6 +36,12 @@ void br_set_state(struct net_bridge_port *p, unsigned int state) 
	};

	int err;



	/* Don't change the state of the ports if they are driven by a different

	 * protocol.

	 */

	if (p->flags & BR_MRP_AWARE)

		return;



	p->state = state;

	err = switchdev_port_attr_set(p->dev, &attr);

	if (err && err != -EOPNOTSUPP)

net/bridge/br_stp_if.c

+10 −1
Original line number Diff line number Diff line
@@ -196,10 +196,17 @@ static void br_stp_stop(struct net_bridge *br) 
	br->stp_enabled = BR_NO_STP;

}



void br_stp_set_enabled(struct net_bridge *br, unsigned long val)

int br_stp_set_enabled(struct net_bridge *br, unsigned long val,

		       struct netlink_ext_ack *extack)

{

	ASSERT_RTNL();



	if (br_mrp_enabled(br)) {

		NL_SET_ERR_MSG_MOD(extack,

				   "STP can't be enabled if MRP is already enabled\n");

		return -EINVAL;

	}



	if (val) {

		if (br->stp_enabled == BR_NO_STP)

			br_stp_start(br);
@@ -207,6 +214,8 @@ void br_stp_set_enabled(struct net_bridge *br, unsigned long val) 
		if (br->stp_enabled != BR_NO_STP)

			br_stp_stop(br);

	}



	return 0;

}



/* called under bridge lock */

CRA Git | Maintained and supported by SUSTech CRA and CCSE