From c6c921dee2c379671fbf5f99195d782b7de9702b Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Sat, 5 Jul 2008 21:26:41 -0700 Subject: [PATCH] --- yaml --- r: 103256 b: refs/heads/master c: ce305002e1c9b90c2c151ce18bab0b895dd55ae6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/8021q/vlan.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0a2c034f4559..c89eb55a2cfe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b3ce0325f2bf1bb737cb8fc7c349ce8fefdd9e40 +refs/heads/master: ce305002e1c9b90c2c151ce18bab0b895dd55ae6 diff --git a/trunk/net/8021q/vlan.c b/trunk/net/8021q/vlan.c index b591bfca1ab2..8cae2daeb1cc 100644 --- a/trunk/net/8021q/vlan.c +++ b/trunk/net/8021q/vlan.c @@ -165,6 +165,8 @@ void unregister_vlan_dev(struct net_device *dev) synchronize_net(); + unregister_netdevice(dev); + /* If the group is now empty, kill off the group. */ if (grp->nr_vlans == 0) { if (real_dev->features & NETIF_F_HW_VLAN_RX) @@ -178,8 +180,6 @@ void unregister_vlan_dev(struct net_device *dev) /* Get rid of the vlan's reference to real_dev */ dev_put(real_dev); - - unregister_netdevice(dev); } static void vlan_transfer_operstate(const struct net_device *dev,