X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;ds=sidebyside;f=net%2Fbridge%2Fbr_if.c;h=1bacca4cb6764b3fd3652a5b74bfbcef0866db73;hb=14d74e0cab7a7779a7ff0c3863c04c8a8e507106;hp=5dbdfdfc3a34a13f02815e574da427d88d228526;hpb=3c709f8fb43e07a0403bba4a8ca7ba00ab874994;p=android-x86%2Fkernel.git

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 5dbdfdfc3a34..1bacca4cb676 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -147,6 +147,7 @@ static void del_nbp(struct net_bridge_port *p)
 	dev->priv_flags &= ~IFF_BRIDGE_PORT;
 
 	netdev_rx_handler_unregister(dev);
+	synchronize_net();
 
 	netdev_set_master(dev, NULL);
 
@@ -338,6 +339,8 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
 	if (IS_ERR(p))
 		return PTR_ERR(p);
 
+	call_netdevice_notifiers(NETDEV_JOIN, dev);
+
 	err = dev_set_promiscuity(dev, 1);
 	if (err)
 		goto put_back;