diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2010-02-16 09:05:04 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-16 14:55:25 -0800 |
| commit | d5aa407f59f5b83d2c50ec88f5bf56d40f1f8978 (patch) | |
| tree | 664c30873708f0e361e5250835238043200f4b50 /net/ipv6/sit.c | |
| parent | c2892f02712e9516d72841d5c019ed6916329794 (diff) | |
| download | op-kernel-dev-d5aa407f59f5b83d2c50ec88f5bf56d40f1f8978.zip op-kernel-dev-d5aa407f59f5b83d2c50ec88f5bf56d40f1f8978.tar.gz | |
tunnels: fix netns vs proto registration ordering
Same stuff as in ip_gre patch: receive hook can be called before netns
setup is done, oopsing in net_generic().
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/sit.c')
| -rw-r--r-- | net/ipv6/sit.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 10207cc..52ffd29 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -1227,15 +1227,14 @@ static int __init sit_init(void) printk(KERN_INFO "IPv6 over IPv4 tunneling driver\n"); - if (xfrm4_tunnel_register(&sit_handler, AF_INET6) < 0) { - printk(KERN_INFO "sit init: Can't add protocol\n"); - return -EAGAIN; - } - err = register_pernet_device(&sit_net_ops); if (err < 0) - xfrm4_tunnel_deregister(&sit_handler, AF_INET6); - + return err; + err = xfrm4_tunnel_register(&sit_handler, AF_INET6); + if (err < 0) { + unregister_pernet_device(&sit_net_ops); + printk(KERN_INFO "sit init: Can't add protocol\n"); + } return err; } |
