dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

bridge: call br_netpoll_disable in br_add_if 

When netdev_set_master faild in br_add_if, we should
call br_netpoll_disable to do some cleanup jobs,such
as free the memory of struct netpoll which allocated
in br_netpoll_enable.

Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
Acked-by: Cong Wang <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Gao feng 2012-12-19 23:41:43 +00:00 committed by David S. Miller
parent 9650388b5c
commit 9b1536c490
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/bridge/br_if.c
View File

@ -366,11 +366,11 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
err = netdev_set_master(dev, br->dev);
if (err)
goto err3;
goto err4;
err = netdev_rx_handler_register(dev, br_handle_frame, p);
if (err)
goto err4;
goto err5;
dev->priv_flags |= IFF_BRIDGE_PORT;
@ -402,8 +402,10 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
return 0;
err4:
err5:
netdev_set_master(dev, NULL);
err4:
br_netpoll_disable(p);
err3:
sysfs_remove_link(br->ifobj, p->dev->name);
err2: