iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bridge: respect RFC2863 operational state

Browse Source 
The bridge link detection should follow the operational state
of the lower device, rather than the carrier bit. This allows devices
like tunnels that are controlled by userspace control plane to work
with bridge STP link management.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Reviewed-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
stephen hemminger 2012-12-28 18:15:22 +00:00 committed by David S. Miller
parent aa1113d9f8
commit 576eb62598
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/bridge/br_if.c
View File

@ -66,14 +66,14 @@ void br_port_carrier_check(struct net_bridge_port *p)
struct net_device *dev = p->dev; struct net_device *dev = p->dev;
struct net_bridge *br = p->br; struct net_bridge *br = p->br;
if (netif_running(dev) && netif_carrier_ok(dev)) if (netif_running(dev) && netif_oper_up(dev))
p->path_cost = port_cost(dev); p->path_cost = port_cost(dev);
if (!netif_running(br->dev)) if (!netif_running(br->dev))
return; return;
spin_lock_bh(&br->lock); spin_lock_bh(&br->lock);
if (netif_running(dev) && netif_carrier_ok(dev)) { if (netif_running(dev) && netif_oper_up(dev)) {
if (p->state == BR_STATE_DISABLED) if (p->state == BR_STATE_DISABLED)
br_stp_enable_port(p); br_stp_enable_port(p);
} else { } else {
@ -383,7 +383,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
spin_lock_bh(&br->lock); spin_lock_bh(&br->lock);
changed_addr = br_stp_recalculate_bridge_id(br); changed_addr = br_stp_recalculate_bridge_id(br);
if ((dev->flags & IFF_UP) && netif_carrier_ok(dev) && if (netif_running(dev) && netif_oper_up(dev) &&
(br->dev->flags & IFF_UP)) (br->dev->flags & IFF_UP))
br_stp_enable_port(p); br_stp_enable_port(p);
spin_unlock_bh(&br->lock); spin_unlock_bh(&br->lock);

5
net/bridge/br_netlink.c
View File

@ -181,8 +181,11 @@ static int br_set_port_state(struct net_bridge_port *p, u8 state)
if (p->br->stp_enabled == BR_KERNEL_STP) if (p->br->stp_enabled == BR_KERNEL_STP)
return -EBUSY; return -EBUSY;
/* if device is not up, change is not allowed
* if link is not present, only allowable state is disabled
*/
if (!netif_running(p->dev) || if (!netif_running(p->dev) ||
(!netif_carrier_ok(p->dev) && state != BR_STATE_DISABLED)) (!netif_oper_up(p->dev) && state != BR_STATE_DISABLED))
return -ENETDOWN; return -ENETDOWN;
p->state = state; p->state = state;

2
net/bridge/br_notify.c
View File

@ -82,7 +82,7 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, v
break; break;
case NETDEV_UP: case NETDEV_UP:
if (netif_carrier_ok(dev) && (br->dev->flags & IFF_UP)) { if (netif_running(br->dev) && netif_oper_up(dev)) {
spin_lock_bh(&br->lock); spin_lock_bh(&br->lock);
br_stp_enable_port(p); br_stp_enable_port(p);
spin_unlock_bh(&br->lock); spin_unlock_bh(&br->lock);

2
net/bridge/br_stp_if.c
View File

@ -54,7 +54,7 @@ void br_stp_enable_bridge(struct net_bridge *br)
br_config_bpdu_generation(br); br_config_bpdu_generation(br);
list_for_each_entry(p, &br->port_list, list) { list_for_each_entry(p, &br->port_list, list) {
if ((p->dev->flags & IFF_UP) && netif_carrier_ok(p->dev)) if (netif_running(p->dev) && netif_oper_up(p->dev))
br_stp_enable_port(p); br_stp_enable_port(p);
} }