From 7c1da1fcef97eb683128a7d371c9e4a0410da1e7 Mon Sep 17 00:00:00 2001 From: "nikolay@redhat.com" Date: Thu, 18 Apr 2013 07:33:35 +0000 Subject: [PATCH] --- yaml --- r: 362653 b: refs/heads/master c: a506e7b479e1215c230e4b87fedc246cf748537f h: refs/heads/master i: 362651: 987913820d6b8350c19378c750e8f883fb39934a 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 038ce5b7f88c..8bd410400ef8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 25e40305d4f4399bc8ecf9c9b7cf43493bb40bbd +refs/heads/master: a506e7b479e1215c230e4b87fedc246cf748537f diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c index 4cecb80df854..dd67c49070d7 100644 --- a/trunk/drivers/net/bonding/bond_main.c +++ b/trunk/drivers/net/bonding/bond_main.c @@ -1906,6 +1906,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) bond_mc_list_flush(bond_dev, slave_dev); netif_addr_unlock_bh(bond_dev); } + bond_del_vlans_from_slave(bond, slave_dev); write_lock_bh(&bond->lock); bond_detach_slave(bond, new_slave); write_unlock_bh(&bond->lock);