diff options
| author | David S. Miller <davem@davemloft.net> | 2016-03-11 14:59:55 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-03-11 14:59:55 -0500 |
| commit | 5390dba1a5390c9724db5c5714506301dfe31a7b (patch) | |
| tree | 02e8b364036b21cb569d138aaa52e0d70f0e27e9 /net | |
| parent | 8e2ad4113ce4671686740f808ff2795395c39eef (diff) | |
| parent | 4c656c13b254d598e83e586b7b4d36a2043dad85 (diff) | |
Merge branch 'bridge_ageing_time'
Stephen Hemminger says:
====================
bridge: ageing timer regression fix
This fixes regression in how ageing timer is managed.
Backing out the change required fixing switch drivers as well.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bridge/br_stp.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c index c22816a0b1b1..e23449094188 100644 --- a/net/bridge/br_stp.c +++ b/net/bridge/br_stp.c @@ -562,6 +562,14 @@ int br_set_max_age(struct net_bridge *br, unsigned long val) } +/* Set time interval that dynamic forwarding entries live + * For pure software bridge, allow values outside the 802.1 + * standard specification for special cases: + * 0 - entry never ages (all permanant) + * 1 - entry disappears (no persistance) + * + * Offloaded switch entries maybe more restrictive + */ int br_set_ageing_time(struct net_bridge *br, u32 ageing_time) { struct switchdev_attr attr = { @@ -573,9 +581,6 @@ int br_set_ageing_time(struct net_bridge *br, u32 ageing_time) unsigned long t = clock_t_to_jiffies(ageing_time); int err; - if (t < BR_MIN_AGEING_TIME || t > BR_MAX_AGEING_TIME) - return -ERANGE; - err = switchdev_port_attr_set(br->dev, &attr); if (err) return err; |