>From e52d45fe5518e8447b54b440f41d318db146a19e Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Tue, 30 Aug 2011 13:44:23 +0100 Subject: [PATCH] tunnels: fix netns vs proto registration ordering -- fix stable backport BugLink: http://bugs.launchpad.net/bugs/837421 As per Stratos Psomadakis the backport of the upstream commit below is flawed and introduces crashes when using this ipv6 tunnel type: commit a14a3f90745c4831a1437528706b38daa1db4885 Author: Alexey Dobriyan Date: Tue Feb 16 09:05:04 2010 +0000 tunnels: fix netns vs proto registration ordering Signed-off-by: Andy Whitcroft Acked-by: Stefan Bader Signed-off-by: Tim Gardner --- net/ipv6/ip6_tunnel.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 7fb3e02..53e0d51 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -1466,7 +1466,7 @@ static int __init ip6_tunnel_init(void) { int err; - err = register_pernet_device(&ip6_tnl_net_ops); + err = register_pernet_gen_device(&ip6_tnl_net_id, &ip6_tnl_net_ops); if (err < 0) goto out_pernet; -- 1.7.0.4