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.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.c')
| -rw-r--r-- | net/8021q/vlan.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index 718d635d3379..b2274d1fd605 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c | |||
| @@ -119,6 +119,9 @@ void unregister_vlan_dev(struct net_device *dev, struct list_head *head) | |||
| 119 | 119 | ||
| 120 | grp->nr_vlans--; | 120 | grp->nr_vlans--; |
| 121 | 121 | ||
| 122 | if (vlan->flags & VLAN_FLAG_GVRP) | ||
| 123 | vlan_gvrp_request_leave(dev); | ||
| 124 | |||
| 122 | vlan_group_set_device(grp, vlan_id, NULL); | 125 | vlan_group_set_device(grp, vlan_id, NULL); |
| 123 | /* Because unregister_netdevice_queue() makes sure at least one rcu | 126 | /* Because unregister_netdevice_queue() makes sure at least one rcu |
| 124 | * grace period is respected before device freeing, | 127 | * grace period is respected before device freeing, |