From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri, 11 Mar 2011 20:47:45 +0000 (-0800)
Subject: .37 patches
X-Git-Tag: v2.6.37.4~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bc2e3a3a7d25cb2d6ce84b445f2c45c46bc85f0f;p=thirdparty%2Fkernel%2Fstable-queue.git

.37 patches
---

diff --git a/queue-2.6.37/ip6ip6-autoload-ip6-tunnel.patch b/queue-2.6.37/ip6ip6-autoload-ip6-tunnel.patch
new file mode 100644
index 00000000000..c3d2dee3439
--- /dev/null
+++ b/queue-2.6.37/ip6ip6-autoload-ip6-tunnel.patch
@@ -0,0 +1,30 @@
+From: stephen hemminger <shemminger@vyatta.com>
+Date: Thu, 10 Mar 2011 11:43:19 +0000 (+0000)
+Subject: ip6ip6: autoload ip6 tunnel
+
+From: stephen hemminger <shemminger@vyatta.com>
+
+commit 6dfbd87a20a737641ef228230c77f4262434fa24 upstream
+
+ip6ip6: autoload ip6 tunnel
+
+Add necessary alias to autoload ip6ip6 tunnel module.
+
+Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ net/ipv6/ip6_tunnel.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/net/ipv6/ip6_tunnel.c
++++ b/net/ipv6/ip6_tunnel.c
+@@ -57,6 +57,7 @@
+ MODULE_AUTHOR("Ville Nuorvala");
+ MODULE_DESCRIPTION("IPv6 tunneling device");
+ MODULE_LICENSE("GPL");
++MODULE_ALIAS_NETDEV("ip6tnl0");
+ 
+ #define IPV6_TLV_TEL_DST_SIZE 8
+ 
diff --git a/queue-2.6.37/series b/queue-2.6.37/series
index b245dd8b4cb..641ca97104e 100644
--- a/queue-2.6.37/series
+++ b/queue-2.6.37/series
@@ -27,3 +27,4 @@ ivtv-fix-corrective-action-taken-upon-dma-err-interrupt-to-avoid-hang.patch
 cx23885-revert-check-for-slave-nack-on-all-transactions.patch
 cx25840-fix-probing-of-cx2583x-chips.patch
 dib7000m-add-pid-filtering.patch
+ip6ip6-autoload-ip6-tunnel.patch