summaryrefslogtreecommitdiffstats
path: root/net/8021q/vlan_dev.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-05-11 20:26:15 +0200
committerDavid S. Miller <davem@davemloft.net>2011-05-11 20:26:58 +0200
commit3c709f8fb43e07a0403bba4a8ca7ba00ab874994 (patch)
tree9efc1e2bf6930851f0224f525b6cde0f5297fa61 /net/8021q/vlan_dev.c
parentMerge branch 'tipc-May10-2011' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff)
parentMerge branch 'pablo/nf-2.6-updates' of git://1984.lsi.us.es/net-2.6 (diff)
downloadlinux-3c709f8fb43e07a0403bba4a8ca7ba00ab874994.tar.xz
linux-3c709f8fb43e07a0403bba4a8ca7ba00ab874994.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-3.6
Conflicts: drivers/net/benet/be_main.c
Diffstat (limited to 'net/8021q/vlan_dev.c')
-rw-r--r--net/8021q/vlan_dev.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index d174c312b7f1..58f8010e1aef 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -314,9 +314,6 @@ static int vlan_dev_stop(struct net_device *dev)
struct vlan_dev_info *vlan = vlan_dev_info(dev);
struct net_device *real_dev = vlan->real_dev;
- if (vlan->flags & VLAN_FLAG_GVRP)
- vlan_gvrp_request_leave(dev);
-
dev_mc_unsync(real_dev, dev);
dev_uc_unsync(real_dev, dev);
if (dev->flags & IFF_ALLMULTI)