diff options
| -rw-r--r-- | drivers/net/bareudp.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/drivers/net/bareudp.c b/drivers/net/bareudp.c index 7dedf4867e7b..c3b5ed52d877 100644 --- a/drivers/net/bareudp.c +++ b/drivers/net/bareudp.c @@ -701,12 +701,13 @@ static int bareudp_link_config(struct net_device *dev, return 0; } -static void __bareudp_dellink(struct net_device *dev, struct list_head *head) +static void __bareudp_dellink(struct net *net, struct net_device *dev, + struct list_head *head) { struct bareudp_dev *bareudp = netdev_priv(dev); - list_del(&bareudp->next); - unregister_netdevice_queue(dev, head); + list_del_init(&bareudp->next); + unregister_netdevice_queue_net(net, dev, head); } static void bareudp_dellink(struct net_device *dev, struct list_head *head) @@ -717,7 +718,8 @@ static void bareudp_dellink(struct net_device *dev, struct list_head *head) bn = net_generic(bareudp->net, bareudp_net_id); mutex_lock(&bn->lock); - __bareudp_dellink(dev, head); + if (!list_empty(&bareudp->next)) + __bareudp_dellink(dev_net(dev), dev, head); mutex_unlock(&bn->lock); } @@ -811,14 +813,22 @@ static void __net_exit bareudp_exit_rtnl_net(struct net *net, mutex_lock(&bn->lock); list_for_each_entry_safe(bareudp, next, &bn->bareudp_list, next) - __bareudp_dellink(bareudp->dev, dev_kill_list); + __bareudp_dellink(net, bareudp->dev, dev_kill_list); mutex_unlock(&bn->lock); } +static void __net_exit bareudp_exit_net(struct net *net) +{ + struct bareudp_net *bn = net_generic(net, bareudp_net_id); + + WARN_ON_ONCE(!list_empty(&bn->bareudp_list)); +} + static struct pernet_operations bareudp_net_ops = { .init = bareudp_init_net, .exit_rtnl = bareudp_exit_rtnl_net, + .exit = bareudp_exit_net, .id = &bareudp_net_id, .size = sizeof(struct bareudp_net), }; |