Commit ce305002 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller

vlan: Move device unregistration before lower dev cleanup

Move the unregister_netdevice() call for the VLAN device before cleanup
for the lower device. This is needed by GVRP so it can send a leave
message before the applicant on the lower device is cleaned up.
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b3ce0325
...@@ -165,6 +165,8 @@ void unregister_vlan_dev(struct net_device *dev) ...@@ -165,6 +165,8 @@ void unregister_vlan_dev(struct net_device *dev)
synchronize_net(); synchronize_net();
unregister_netdevice(dev);
/* If the group is now empty, kill off the group. */ /* If the group is now empty, kill off the group. */
if (grp->nr_vlans == 0) { if (grp->nr_vlans == 0) {
if (real_dev->features & NETIF_F_HW_VLAN_RX) if (real_dev->features & NETIF_F_HW_VLAN_RX)
...@@ -178,8 +180,6 @@ void unregister_vlan_dev(struct net_device *dev) ...@@ -178,8 +180,6 @@ void unregister_vlan_dev(struct net_device *dev)
/* Get rid of the vlan's reference to real_dev */ /* Get rid of the vlan's reference to real_dev */
dev_put(real_dev); dev_put(real_dev);
unregister_netdevice(dev);
} }
static void vlan_transfer_operstate(const struct net_device *dev, static void vlan_transfer_operstate(const struct net_device *dev,
......
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