From: nikolay@redhat.com Date: Thu, 18 Apr 2013 07:33:37 +0000 (+0000) Subject: bonding: disable netpoll on enslave failure X-Git-Tag: MMI-PSA29.97-13-9~14628^2~7^2~1 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fc7a72ac86e2956dd405b0c604fea45a2702f567;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git bonding: disable netpoll on enslave failure slave_disable_netpoll() is not called upon enslave failure which would lead to a memory leak. Call slave_disable_netpoll() after err_detach as that's the first error path after enabling netpoll on that slave. Signed-off-by: Nikolay Aleksandrov Signed-off-by: David S. Miller --- diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 1137d5eac450..ae35b28a39e4 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -1920,6 +1920,7 @@ err_detach: write_unlock_bh(&bond->curr_slave_lock); read_unlock(&bond->lock); } + slave_disable_netpoll(new_slave); err_close: slave_dev->priv_flags &= ~IFF_BONDING;