summaryrefslogtreecommitdiffstats
path: root/net/bridge/br_if.c
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2013-04-02 07:45:00 +0200
committerDavid S. Miller <davem@davemloft.net>2013-04-02 18:10:58 +0200
commit4a0b5ec12f0ffc3024616e6dc62cf8a04c54edcd (patch)
tree2859202401cbf66ca308bec127b3d59ecb45bc19 /net/bridge/br_if.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
downloadlinux-4a0b5ec12f0ffc3024616e6dc62cf8a04c54edcd.tar.xz
linux-4a0b5ec12f0ffc3024616e6dc62cf8a04c54edcd.zip
bridge: remove a redundant synchronize_net()
commit 00cfec37484761 (net: add a synchronize_net() in netdev_rx_handler_unregister()) allows us to remove the synchronized_net() call from del_nbp() Signed-off-by: Eric Dumazet <edumazet@google.com> Cc: Veaceslav Falico <vfalico@redhat.com> Cc: Stephen Hemminger <stephen@networkplumber.org> Acked-by: Veaceslav Falico <vfalico@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_if.c')
-rw-r--r--net/bridge/br_if.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index ef1b91431c6b..f17fcb3097c2 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -148,7 +148,6 @@ static void del_nbp(struct net_bridge_port *p)
dev->priv_flags &= ~IFF_BRIDGE_PORT;
netdev_rx_handler_unregister(dev);
- synchronize_net();
netdev_upper_dev_unlink(dev, br->dev);