OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/linux-2.6-nsfd
[android-x86/kernel.git]
/
net
/
bridge
/
br_if.c
diff --git
a/net/bridge/br_if.c
b/net/bridge/br_if.c
index
5dbdfdf
..
1bacca4
100644
(file)
--- 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);
dev->priv_flags &= ~IFF_BRIDGE_PORT;
netdev_rx_handler_unregister(dev);
+ synchronize_net();
netdev_set_master(dev, NULL);
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);
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;
err = dev_set_promiscuity(dev, 1);
if (err)
goto put_back;