aboutsummaryrefslogtreecommitdiffstats
path: root/net/8021q/vlan.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/8021q/vlan.c')
-rw-r--r--net/8021q/vlan.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index 8836575f9d7..6b5c9dddaa7 100644
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -140,7 +140,7 @@ static void vlan_rcu_free(struct rcu_head *rcu)
140 vlan_group_free(container_of(rcu, struct vlan_group, rcu)); 140 vlan_group_free(container_of(rcu, struct vlan_group, rcu));
141} 141}
142 142
143void unregister_vlan_dev(struct net_device *dev) 143void unregister_vlan_dev(struct net_device *dev, struct list_head *head)
144{ 144{
145 struct vlan_dev_info *vlan = vlan_dev_info(dev); 145 struct vlan_dev_info *vlan = vlan_dev_info(dev);
146 struct net_device *real_dev = vlan->real_dev; 146 struct net_device *real_dev = vlan->real_dev;
@@ -164,7 +164,7 @@ void unregister_vlan_dev(struct net_device *dev)
164 164
165 synchronize_net(); 165 synchronize_net();
166 166
167 unregister_netdevice(dev); 167 unregister_netdevice_queue(dev, head);
168 168
169 /* If the group is now empty, kill off the group. */ 169 /* If the group is now empty, kill off the group. */
170 if (grp->nr_vlans == 0) { 170 if (grp->nr_vlans == 0) {
@@ -535,7 +535,7 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,
535 if (grp->nr_vlans == 1) 535 if (grp->nr_vlans == 1)
536 i = VLAN_GROUP_ARRAY_LEN; 536 i = VLAN_GROUP_ARRAY_LEN;
537 537
538 unregister_vlan_dev(vlandev); 538 unregister_vlan_dev(vlandev, NULL);
539 } 539 }
540 break; 540 break;
541 } 541 }
@@ -642,7 +642,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
642 err = -EPERM; 642 err = -EPERM;
643 if (!capable(CAP_NET_ADMIN)) 643 if (!capable(CAP_NET_ADMIN))
644 break; 644 break;
645 unregister_vlan_dev(dev); 645 unregister_vlan_dev(dev, NULL);
646 err = 0; 646 err = 0;
647 break; 647 break;
648 648