diff options
| author | Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2011-04-22 08:31:16 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-28 22:33:08 +0200 |
| commit | c4d27ef957cd9261c0bc8488edaf8390e412cd35 (patch) | |
| tree | f8e263ca9a1842803a2265bffd5eaa3e5b3d9660 /net/bridge/br_notify.c | |
| parent | net: fix netdev_increment_features() (diff) | |
| download | linux-c4d27ef957cd9261c0bc8488edaf8390e412cd35.tar.xz linux-c4d27ef957cd9261c0bc8488edaf8390e412cd35.zip | |
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.c | 5 |
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 break; case NETDEV_FEAT_CHANGE: - spin_lock_bh(&br->lock); - if (netif_running(br->dev)) - br_features_recompute(br); - spin_unlock_bh(&br->lock); + netdev_update_features(br->dev); break; case NETDEV_DOWN: |