[VLAN]: remove vlan_devices[] entries properly.

39d712cc · David S. Miller · Jeff Garzik · a2ef64a3 · 39d712cc
Commit 39d712cc authored Nov 19, 2002 by David S. Miller Committed by Jeff Garzik Nov 19, 2002
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

net/8021q/vlan.c net/8021q/vlan.c +5 -4

No files found.
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -229,12 +229,13 @@ static int unregister_vlan_dev(struct net_device *real_dev,
 			if (real_dev->features &
 			    (NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER)) {
 				real_dev->vlan_rx_kill_vid(real_dev, vlan_id);
-			} else {
-				br_write_lock(BR_NETPROTO_LOCK);
-				grp->vlan_devices[vlan_id] = NULL;
-				br_write_unlock(BR_NETPROTO_LOCK);
 			}

+			br_write_lock(BR_NETPROTO_LOCK);
+			grp->vlan_devices[vlan_id] = NULL;
+			br_write_unlock(BR_NETPROTO_LOCK);
+
+
 			/* Caller unregisters (and if necessary, puts)
 			 * VLAN device, but we get rid of the reference to
 			 * real_dev here.