projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[NETFILTER]: {eb,ip6,ip}t_LOG: remove remains of LOG target overloading
[powerpc.git]
/
net
/
bridge
/
br_notify.c
diff --git
a/net/bridge/br_notify.c
b/net/bridge/br_notify.c
index
2027849
..
c8451d3
100644
(file)
--- a/
net/bridge/br_notify.c
+++ b/
net/bridge/br_notify.c
@@
-26,7
+26,7
@@
struct notifier_block br_device_notifier = {
/*
* Handle changes in state of network devices enslaved to a bridge.
/*
* Handle changes in state of network devices enslaved to a bridge.
- *
+ *
* Note: don't care about up/down if bridge itself is down, because
* port state is checked when bridge is brought up.
*/
* Note: don't care about up/down if bridge itself is down, because
* port state is checked when bridge is brought up.
*/
@@
-42,49
+42,53
@@
static int br_device_event(struct notifier_block *unused, unsigned long event, v
br = p->br;
br = p->br;
- spin_lock_bh(&br->lock);
switch (event) {
case NETDEV_CHANGEMTU:
dev_set_mtu(br->dev, br_min_mtu(br));
break;
case NETDEV_CHANGEADDR:
switch (event) {
case NETDEV_CHANGEMTU:
dev_set_mtu(br->dev, br_min_mtu(br));
break;
case NETDEV_CHANGEADDR:
+ spin_lock_bh(&br->lock);
br_fdb_changeaddr(p, dev->dev_addr);
br_fdb_changeaddr(p, dev->dev_addr);
- br_ifinfo_notify(RTM_NEWLINK, p);
br_stp_recalculate_bridge_id(br);
br_stp_recalculate_bridge_id(br);
+ spin_unlock_bh(&br->lock);
break;
case NETDEV_CHANGE:
break;
case NETDEV_CHANGE:
- if (br->dev->flags & IFF_UP)
- schedule_delayed_work(&p->carrier_check, BR_PORT_DEBOUNCE);
+ br_port_carrier_check(p);
break;
case NETDEV_FEAT_CHANGE:
break;
case NETDEV_FEAT_CHANGE:
- if (br->dev->flags & IFF_UP)
+ spin_lock_bh(&br->lock);
+ if (netif_running(br->dev))
br_features_recompute(br);
br_features_recompute(br);
-
- /* could do recursive feature change notification
- * but who would care??
- */
+ spin_unlock_bh(&br->lock);
break;
case NETDEV_DOWN:
break;
case NETDEV_DOWN:
+ spin_lock_bh(&br->lock);
if (br->dev->flags & IFF_UP)
br_stp_disable_port(p);
if (br->dev->flags & IFF_UP)
br_stp_disable_port(p);
+ spin_unlock_bh(&br->lock);
break;
case NETDEV_UP:
break;
case NETDEV_UP:
- if (netif_carrier_ok(dev) && (br->dev->flags & IFF_UP))
+ if (netif_carrier_ok(dev) && (br->dev->flags & IFF_UP)) {
+ spin_lock_bh(&br->lock);
br_stp_enable_port(p);
br_stp_enable_port(p);
+ spin_unlock_bh(&br->lock);
+ }
break;
case NETDEV_UNREGISTER:
break;
case NETDEV_UNREGISTER:
- spin_unlock_bh(&br->lock);
br_del_if(br, dev);
br_del_if(br, dev);
- goto done;
- }
- spin_unlock_bh(&br->lock);
+ break;
+ }
+
+ /* Events that may cause spanning tree to refresh */
+ if (event == NETDEV_CHANGEADDR || event == NETDEV_UP ||
+ event == NETDEV_CHANGE || event == NETDEV_DOWN)
+ br_ifinfo_notify(RTM_NEWLINK, p);
- done:
return NOTIFY_DONE;
}
return NOTIFY_DONE;
}