diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2015-03-31 19:22:28 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2015-03-31 19:22:28 +0000 |
| commit | 5764ab1625ce5dd58e92e4e65751a29fe18dbd2c (patch) | |
| tree | e98a01c1abaeaa5bc16030efe9b236d6d0e4f260 /target/linux/generic/patches-4.0/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch | |
| parent | 5d823c725d09bd2beee36db489c4fad5ebcc5d73 (diff) | |
| download | master-187ad058-5764ab1625ce5dd58e92e4e65751a29fe18dbd2c.tar.gz master-187ad058-5764ab1625ce5dd58e92e4e65751a29fe18dbd2c.tar.bz2 master-187ad058-5764ab1625ce5dd58e92e4e65751a29fe18dbd2c.zip | |
generic/4.0: upgrade to 4.0-rc6
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45198 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-4.0/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch')
| -rw-r--r-- | target/linux/generic/patches-4.0/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/target/linux/generic/patches-4.0/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch b/target/linux/generic/patches-4.0/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch index 787aef5b05..41454c945b 100644 --- a/target/linux/generic/patches-4.0/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch +++ b/target/linux/generic/patches-4.0/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch @@ -14,10 +14,8 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org> net/ipv6/ip6_tunnel.c | 276 +++++++++++++++++++++++++++++++++++++++-- 3 files changed, 291 insertions(+), 11 deletions(-) -Index: linux-4.0-rc5/include/net/ip6_tunnel.h -=================================================================== ---- linux-4.0-rc5.orig/include/net/ip6_tunnel.h -+++ linux-4.0-rc5/include/net/ip6_tunnel.h +--- a/include/net/ip6_tunnel.h ++++ b/include/net/ip6_tunnel.h @@ -15,6 +15,18 @@ /* determine capability on a per-packet basis */ #define IP6_TNL_F_CAP_PER_PACKET 0x40000 @@ -45,10 +43,8 @@ Index: linux-4.0-rc5/include/net/ip6_tunnel.h __be16 i_flags; __be16 o_flags; -Index: linux-4.0-rc5/include/uapi/linux/if_tunnel.h -=================================================================== ---- linux-4.0-rc5.orig/include/uapi/linux/if_tunnel.h -+++ linux-4.0-rc5/include/uapi/linux/if_tunnel.h +--- a/include/uapi/linux/if_tunnel.h ++++ b/include/uapi/linux/if_tunnel.h @@ -57,10 +57,23 @@ enum { IFLA_IPTUN_ENCAP_FLAGS, IFLA_IPTUN_ENCAP_SPORT, @@ -73,10 +69,8 @@ Index: linux-4.0-rc5/include/uapi/linux/if_tunnel.h enum tunnel_encap_types { TUNNEL_ENCAP_NONE, TUNNEL_ENCAP_FOU, -Index: linux-4.0-rc5/net/ipv6/ip6_tunnel.c -=================================================================== ---- linux-4.0-rc5.orig/net/ipv6/ip6_tunnel.c -+++ linux-4.0-rc5/net/ipv6/ip6_tunnel.c +--- a/net/ipv6/ip6_tunnel.c ++++ b/net/ipv6/ip6_tunnel.c @@ -16,6 +16,8 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. |