diff options
author | Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> | 2005-07-30 17:46:44 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2005-07-30 17:46:44 -0700 |
commit | db44575f6fd55df6ff67ddd21f7ad5be5a741136 (patch) | |
tree | 3282b763dbc363202a328c473c47a8cad954687e /net/ipv4/ipip.c | |
parent | 1f494c0e040b001cf844280910d04ba7ebdc2898 (diff) | |
download | kernel_samsung_smdk4412-db44575f6fd55df6ff67ddd21f7ad5be5a741136.zip kernel_samsung_smdk4412-db44575f6fd55df6ff67ddd21f7ad5be5a741136.tar.gz kernel_samsung_smdk4412-db44575f6fd55df6ff67ddd21f7ad5be5a741136.tar.bz2 |
[NET]: fix oops after tunnel module unload
Tunnel modules used to obtain module refcount each time when
some tunnel was created, which meaned that tunnel could be unloaded
only after all the tunnels are deleted.
Since killing old MOD_*_USE_COUNT macros this protection has gone.
It is possible to return it back as module_get/put, but it looks
more natural and practically useful to force destruction of all
the child tunnels on module unload.
Signed-off-by: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ipip.c')
-rw-r--r-- | net/ipv4/ipip.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c index c3947cd..c05c1df 100644 --- a/net/ipv4/ipip.c +++ b/net/ipv4/ipip.c @@ -255,7 +255,6 @@ static struct ip_tunnel * ipip_tunnel_locate(struct ip_tunnel_parm *parms, int c dev_hold(dev); ipip_tunnel_link(nt); - /* Do not decrement MOD_USE_COUNT here. */ return nt; failed: @@ -920,12 +919,29 @@ static int __init ipip_init(void) goto out; } +static void __exit ipip_destroy_tunnels(void) +{ + int prio; + + for (prio = 1; prio < 4; prio++) { + int h; + for (h = 0; h < HASH_SIZE; h++) { + struct ip_tunnel *t; + while ((t = tunnels[prio][h]) != NULL) + unregister_netdevice(t->dev); + } + } +} + static void __exit ipip_fini(void) { if (ipip_unregister() < 0) printk(KERN_INFO "ipip close: can't deregister tunnel\n"); - unregister_netdev(ipip_fb_tunnel_dev); + rtnl_lock(); + ipip_destroy_tunnels(); + unregister_netdevice(ipip_fb_tunnel_dev); + rtnl_unlock(); } module_init(ipip_init); |