From 9cffd1404e8ceb916a52d654980f16527a0bec9a Mon Sep 17 00:00:00 2001 From: "nikolay@redhat.com" Date: Thu, 18 Apr 2013 07:33:37 +0000 Subject: [PATCH] --- yaml --- r: 362655 b: refs/heads/master c: fc7a72ac86e2956dd405b0c604fea45a2702f567 h: refs/heads/master i: 362653: 7c1da1fcef97eb683128a7d371c9e4a0410da1e7 362651: 987913820d6b8350c19378c750e8f883fb39934a 362647: 8453aab4d964f621dc75122efdd0bc77a8196aef 362639: 1316f52200b3a14f16762dd94db6ad4c640da3a6 362623: 118577428858f94e228d1547aa58139912a045d3 v: v3 --- [refs] | 2 +- trunk/drivers/net/bonding/bond_main.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3dc5934e326a..c59a90f584d0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c5913b53fefc9d9e15a2d0f93042766658d9f3f +refs/heads/master: fc7a72ac86e2956dd405b0c604fea45a2702f567 diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c index 1137d5eac450..ae35b28a39e4 100644 --- a/trunk/drivers/net/bonding/bond_main.c +++ b/trunk/drivers/net/bonding/bond_main.c @@ -1920,6 +1920,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) write_unlock_bh(&bond->curr_slave_lock); read_unlock(&bond->lock); } + slave_disable_netpoll(new_slave); err_close: slave_dev->priv_flags &= ~IFF_BONDING;