diff options
| author | Gao feng <gaofeng@cn.fujitsu.com> | 2012-12-20 00:41:43 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-12-21 22:17:07 +0100 |
| commit | 9b1536c490d572f2ed4af0a15bd5d6cf349a9db4 (patch) | |
| tree | de6ce47b0545fdee53eac2c3455117110a4ed397 /net | |
| parent | ipv4: arp: fix a lockdep splat in arp_solicit() (diff) | |
| download | linux-9b1536c490d572f2ed4af0a15bd5d6cf349a9db4.tar.xz linux-9b1536c490d572f2ed4af0a15bd5d6cf349a9db4.zip | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bridge/br_if.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index 1c8fdc3558cd..37fe693471a8 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c @@ -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: |