aboutsummaryrefslogtreecommitdiffstats
path: root/net/bridge/br_notify.c
diff options
context:
space:
mode:
authorMichał Mirosław <mirq-linux@rere.qmqm.pl>2011-04-22 02:31:16 -0400
committerDavid S. Miller <davem@davemloft.net>2011-04-28 16:33:08 -0400
commitc4d27ef957cd9261c0bc8488edaf8390e412cd35 (patch)
treef8e263ca9a1842803a2265bffd5eaa3e5b3d9660 /net/bridge/br_notify.c
parent1742f183fc218798dab6fcf0ded25b6608fc0a48 (diff)
bridge: convert br_features_recompute() to ndo_fix_features
Note: netdev_update_features() needs only rtnl_lock as br->port_list is only changed while holding it. Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_notify.c')
-rw-r--r--net/bridge/br_notify.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/net/bridge/br_notify.c b/net/bridge/br_notify.c
index 606b323e8a0c..6545ee9591d1 100644
--- a/net/bridge/br_notify.c
+++ b/net/bridge/br_notify.c
@@ -66,10 +66,7 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, v
66 break; 66 break;
67 67
68 case NETDEV_FEAT_CHANGE: 68 case NETDEV_FEAT_CHANGE:
69 spin_lock_bh(&br->lock); 69 netdev_update_features(br->dev);
70 if (netif_running(br->dev))
71 br_features_recompute(br);
72 spin_unlock_bh(&br->lock);
73 break; 70 break;
74 71
75 case NETDEV_DOWN: 72 case NETDEV_DOWN: