| Message ID | 1355996503-19318-1-git-send-email-gaofeng@cn.fujitsu.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Thu, 2012-12-20 at 17:41 +0800, Gao feng wrote: > 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> Looks good! Acked-by: Cong Wang <amwang@redhat.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Cong Wang <amwang@redhat.com> Date: Thu, 20 Dec 2012 18:33:33 +0800 > On Thu, 2012-12-20 at 17:41 +0800, Gao feng wrote: >> 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> > > Looks good! > > Acked-by: Cong Wang <amwang@redhat.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index 1c8fdc3..37fe693 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:
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> --- net/bridge/br_if.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-)