Skip to content

L
linux
Commit 39d712cc authored by David S. Miller's avatar David S. Miller Committed by Jeff Garzik
Browse files
Options

[VLAN]: remove vlan_devices[] entries properly.

parent a2ef64a3
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
net/8021q/vlan.c
View file @ 39d712cc
...@@ -229,11 +229,12 @@ static int unregister_vlan_dev(struct net_device *real_dev, ...@@ -229,11 +229,12 @@ static int unregister_vlan_dev(struct net_device *real_dev,
if (real_dev->features & if (real_dev->features &
(NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER)) { (NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER)) {
real_dev->vlan_rx_kill_vid(real_dev, vlan_id); real_dev->vlan_rx_kill_vid(real_dev, vlan_id);
} else { }
br_write_lock(BR_NETPROTO_LOCK); br_write_lock(BR_NETPROTO_LOCK);
grp->vlan_devices[vlan_id] = NULL; grp->vlan_devices[vlan_id] = NULL;
br_write_unlock(BR_NETPROTO_LOCK); br_write_unlock(BR_NETPROTO_LOCK);
}
/* Caller unregisters (and if necessary, puts) /* Caller unregisters (and if necessary, puts)
* VLAN device, but we get rid of the reference to * VLAN device, but we get rid of the reference to
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7