From bc16c48159bc646d809f80511e7b9317a4871676 Mon Sep 17 00:00:00 2001 From: Cong Wang Date: Fri, 22 Mar 2013 19:14:07 +0000 Subject: [PATCH] --- yaml --- r: 361835 b: refs/heads/master c: 4a7df340ed1bac190c124c1601bfc10cde9fb4fb h: refs/heads/master i: 361833: 4c0e08acc58ba94d74999182c1cf47b75c7e2709 361831: c85c5f9687bac710516bde0d55a4646ad1b32806 v: v3 --- [refs] | 2 +- trunk/net/8021q/vlan.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index acfdd543857a..96fe273ba84d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9979a55a833883242e3a29f3596676edd7199c46 +refs/heads/master: 4a7df340ed1bac190c124c1601bfc10cde9fb4fb diff --git a/trunk/net/8021q/vlan.c b/trunk/net/8021q/vlan.c index a18714469bf7..85addcd9372b 100644 --- a/trunk/net/8021q/vlan.c +++ b/trunk/net/8021q/vlan.c @@ -86,13 +86,6 @@ void unregister_vlan_dev(struct net_device *dev, struct list_head *head) grp = &vlan_info->grp; - /* Take it out of our own structures, but be sure to interlock with - * HW accelerating devices or SW vlan input packet processing if - * VLAN is not 0 (leave it there for 802.1p). - */ - if (vlan_id) - vlan_vid_del(real_dev, vlan_id); - grp->nr_vlan_devs--; if (vlan->flags & VLAN_FLAG_MVRP) @@ -114,6 +107,13 @@ void unregister_vlan_dev(struct net_device *dev, struct list_head *head) vlan_gvrp_uninit_applicant(real_dev); } + /* Take it out of our own structures, but be sure to interlock with + * HW accelerating devices or SW vlan input packet processing if + * VLAN is not 0 (leave it there for 802.1p). + */ + if (vlan_id) + vlan_vid_del(real_dev, vlan_id); + /* Get rid of the vlan's reference to real_dev */ dev_put(real_dev); }