[gentoo-commits] linux-patches r1970 - genpatches-2.6/trunk/2.6.32

[Stratos Psomadakis (psomas)]

Author: psomas
Date: 2011-08-29 22:34:50 +0000 (Mon, 29 Aug 2011)
New Revision: 1970

Added:
   genpatches-2.6/trunk/2.6.32/2000_fix-broken-backport-for-ipv6-tunnels.patch
Modified:
   genpatches-2.6/trunk/2.6.32/0000_README
Log:
Add patch to fix broken backport for IPv6 tunnels

Modified: genpatches-2.6/trunk/2.6.32/0000_README
===================================================================
--- genpatches-2.6/trunk/2.6.32/0000_README	2011-08-29 22:26:54 UTC (rev 1969)
+++ genpatches-2.6/trunk/2.6.32/0000_README	2011-08-29 22:34:50 UTC (rev 1970)
@@ -223,6 +223,10 @@
 From:   http://www.kernel.org
 Desc:   Linux 2.6.32.46
 
+Patch:  2000_fix-broken-backport-for-ipv6-tunnels.patch
+From:   https://bugs.gentoo.org/show_bug.cgi?id=380609
+Desc:   Fix broken backport for IPv6 tunnels
+
 Patch:  2900_disable-wunused-but-set-var-gcc-4-6-0.patch
 From:   https://bugs.gentoo.org/show_bug.cgi?id=366579
 Desc:   Disable -Wunused-but-set-variable for gcc 4.6.0. Thanks to Stratos Psomadakis

Added: genpatches-2.6/trunk/2.6.32/2000_fix-broken-backport-for-ipv6-tunnels.patch
===================================================================
--- genpatches-2.6/trunk/2.6.32/2000_fix-broken-backport-for-ipv6-tunnels.patch	                        (rev 0)
+++ genpatches-2.6/trunk/2.6.32/2000_fix-broken-backport-for-ipv6-tunnels.patch	2011-08-29 22:34:50 UTC (rev 1970)
@@ -0,0 +1,16 @@
+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.6.1
+