diff options
| author | Daniel Borkmann <dborkman@redhat.com> | 2014-01-13 18:41:20 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-14 23:38:39 -0800 |
| commit | 8425783c0f4292ca5be35097a467e1240735c257 (patch) | |
| tree | 601cab1761c36f24798e4b168595534f5feacb5d /drivers/net/vxlan.c | |
| parent | acaf4e70997ff5ef3588f5a8abb1c228de637bd2 (diff) | |
| download | linux-8425783c0f4292ca5be35097a467e1240735c257.tar.gz linux-8425783c0f4292ca5be35097a467e1240735c257.tar.bz2 linux-8425783c0f4292ca5be35097a467e1240735c257.zip | |
net: vxlan: properly cleanup devs on module unload
We should use vxlan_dellink() handler in vxlan_exit_net(), since
i) we're not in fast-path and we should be consistent in dismantle
just as we would remove a device through rtnl ops, and more
importantly, ii) in case future code will kfree() memory in
vxlan_dellink(), we would leak it right here unnoticed. Therefore,
do not only half of the cleanup work, but make it properly.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vxlan.c')
| -rw-r--r-- | drivers/net/vxlan.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index d35d52f03185..a2dee80e1fb8 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -2710,13 +2710,13 @@ static __net_init int vxlan_init_net(struct net *net) static __net_exit void vxlan_exit_net(struct net *net) { struct vxlan_net *vn = net_generic(net, vxlan_net_id); - struct vxlan_dev *vxlan; - LIST_HEAD(list); + struct vxlan_dev *vxlan, *next; + LIST_HEAD(list_kill); rtnl_lock(); - list_for_each_entry(vxlan, &vn->vxlan_list, next) - unregister_netdevice_queue(vxlan->dev, &list); - unregister_netdevice_many(&list); + list_for_each_entry_safe(vxlan, next, &vn->vxlan_list, next) + vxlan_dellink(vxlan->dev, &list_kill); + unregister_netdevice_many(&list_kill); rtnl_unlock(); } |