diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-11 14:26:15 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-11 14:26:58 -0400 |
| commit | 3c709f8fb43e07a0403bba4a8ca7ba00ab874994 (patch) | |
| tree | 9efc1e2bf6930851f0224f525b6cde0f5297fa61 /net/8021q/vlan_dev.c | |
| parent | 0074820978004cc484b132d7a9ce0df414660d9d (diff) | |
| parent | 9bbc052d5e63512b0ce4e201ea97e12fba9fda82 (diff) | |
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.c | 3 |
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) | |||
| 314 | struct vlan_dev_info *vlan = vlan_dev_info(dev); | 314 | struct vlan_dev_info *vlan = vlan_dev_info(dev); |
| 315 | struct net_device *real_dev = vlan->real_dev; | 315 | struct net_device *real_dev = vlan->real_dev; |
| 316 | 316 | ||
| 317 | if (vlan->flags & VLAN_FLAG_GVRP) | ||
| 318 | vlan_gvrp_request_leave(dev); | ||
| 319 | |||
| 320 | dev_mc_unsync(real_dev, dev); | 317 | dev_mc_unsync(real_dev, dev); |
| 321 | dev_uc_unsync(real_dev, dev); | 318 | dev_uc_unsync(real_dev, dev); |
| 322 | if (dev->flags & IFF_ALLMULTI) | 319 | if (dev->flags & IFF_ALLMULTI) |