Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34c2d9fb authored by Ian Wilson's avatar Ian Wilson Committed by David S. Miller
Browse files

bridge: Allow forward delay to be cfgd when STP enabled



Allow bridge forward delay to be configured when Spanning Tree is enabled.

Signed-off-by: default avatarIan Wilson <iwilson@brocade.com>
Signed-off-by: default avatarStephen Hemminger <stephen@networkplumber.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8f350437
Loading
Loading
Loading
Loading
+4 −9
Original line number Diff line number Diff line
@@ -576,17 +576,12 @@ void __br_set_forward_delay(struct net_bridge *br, unsigned long t)
int br_set_forward_delay(struct net_bridge *br, unsigned long val)
{
	unsigned long t = clock_t_to_jiffies(val);
	int err = -ERANGE;

	spin_lock_bh(&br->lock);
	if (br->stp_enabled != BR_NO_STP &&
	    (t < BR_MIN_FORWARD_DELAY || t > BR_MAX_FORWARD_DELAY))
		goto unlock;
	if (t < BR_MIN_FORWARD_DELAY || t > BR_MAX_FORWARD_DELAY)
		return -ERANGE;

	spin_lock_bh(&br->lock);
	__br_set_forward_delay(br, t);
	err = 0;

unlock:
	spin_unlock_bh(&br->lock);
	return err;
	return 0;
}