diff options
Diffstat (limited to 'net/bridge/br_notify.c')
-rw-r--r-- | net/bridge/br_notify.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/bridge/br_notify.c b/net/bridge/br_notify.c index 20278494e4da..8cd3e4229070 100644 --- a/net/bridge/br_notify.c +++ b/net/bridge/br_notify.c | |||
@@ -26,7 +26,7 @@ struct notifier_block br_device_notifier = { | |||
26 | 26 | ||
27 | /* | 27 | /* |
28 | * Handle changes in state of network devices enslaved to a bridge. | 28 | * Handle changes in state of network devices enslaved to a bridge. |
29 | * | 29 | * |
30 | * Note: don't care about up/down if bridge itself is down, because | 30 | * Note: don't care about up/down if bridge itself is down, because |
31 | * port state is checked when bridge is brought up. | 31 | * port state is checked when bridge is brought up. |
32 | */ | 32 | */ |
@@ -60,11 +60,11 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, v | |||
60 | break; | 60 | break; |
61 | 61 | ||
62 | case NETDEV_FEAT_CHANGE: | 62 | case NETDEV_FEAT_CHANGE: |
63 | if (br->dev->flags & IFF_UP) | 63 | if (br->dev->flags & IFF_UP) |
64 | br_features_recompute(br); | 64 | br_features_recompute(br); |
65 | 65 | ||
66 | /* could do recursive feature change notification | 66 | /* could do recursive feature change notification |
67 | * but who would care?? | 67 | * but who would care?? |
68 | */ | 68 | */ |
69 | break; | 69 | break; |
70 | 70 | ||
@@ -74,7 +74,7 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, v | |||
74 | break; | 74 | break; |
75 | 75 | ||
76 | case NETDEV_UP: | 76 | case NETDEV_UP: |
77 | if (netif_carrier_ok(dev) && (br->dev->flags & IFF_UP)) | 77 | if (netif_carrier_ok(dev) && (br->dev->flags & IFF_UP)) |
78 | br_stp_enable_port(p); | 78 | br_stp_enable_port(p); |
79 | break; | 79 | break; |
80 | 80 | ||
@@ -82,7 +82,7 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, v | |||
82 | spin_unlock_bh(&br->lock); | 82 | spin_unlock_bh(&br->lock); |
83 | br_del_if(br, dev); | 83 | br_del_if(br, dev); |
84 | goto done; | 84 | goto done; |
85 | } | 85 | } |
86 | spin_unlock_bh(&br->lock); | 86 | spin_unlock_bh(&br->lock); |
87 | 87 | ||
88 | done: | 88 | done: |