diff options
| author | John Crispin <blogic@openwrt.org> | 2014-07-20 17:31:15 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2014-07-20 17:31:15 +0000 |
| commit | 4e7b7472600723bfcc14e1816faeac172cf74000 (patch) | |
| tree | ecc4e8a2ecefba56b1bdf85e1e4d6b0290fe8d04 /target/linux/ar71xx | |
| parent | a7911af6eff273183bb185db935b01030fd04882 (diff) | |
| download | upstream-4e7b7472600723bfcc14e1816faeac172cf74000.tar.gz upstream-4e7b7472600723bfcc14e1816faeac172cf74000.tar.bz2 upstream-4e7b7472600723bfcc14e1816faeac172cf74000.zip | |
kernel: refresh 3.10 patches
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41777 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx')
3 files changed, 9 insertions, 9 deletions
diff --git a/target/linux/ar71xx/patches-3.10/722-MIPS-ath79-add-airGateway-support.patch b/target/linux/ar71xx/patches-3.10/722-MIPS-ath79-add-airGateway-support.patch index d26cc2c153..d64007dcf7 100644 --- a/target/linux/ar71xx/patches-3.10/722-MIPS-ath79-add-airGateway-support.patch +++ b/target/linux/ar71xx/patches-3.10/722-MIPS-ath79-add-airGateway-support.patch @@ -1,5 +1,5 @@ ---- a/arch/mips/ath79/mach-ubnt-xm.c 2014-07-18 02:43:23.110693216 +0000 -+++ b/arch/mips/ath79/mach-ubnt-xm.c 2014-07-18 03:20:28.542701485 +0000 +--- a/arch/mips/ath79/mach-ubnt-xm.c ++++ b/arch/mips/ath79/mach-ubnt-xm.c @@ -17,9 +17,11 @@ #include <linux/etherdevice.h> #include <linux/ar8216_platform.h> @@ -63,8 +63,8 @@ +MIPS_MACHINE(ATH79_MACH_UBNT_AIRGW, "UBNT-AGW", "Ubiquiti AirGateway", + ubnt_airgateway_setup); + ---- a/arch/mips/ath79/machtypes.h 2014-07-18 02:45:30.590693688 +0000 -+++ b/arch/mips/ath79/machtypes.h 2014-07-18 02:51:02.490694922 +0000 +--- a/arch/mips/ath79/machtypes.h ++++ b/arch/mips/ath79/machtypes.h @@ -143,6 +143,7 @@ enum ath79_mach_type { ATH79_MACH_TL_WR842N_V2, /* TP-LINK TL-WR842N/ND v2 */ ATH79_MACH_TL_WR941ND, /* TP-LINK TL-WR941ND */ diff --git a/target/linux/ar71xx/patches-3.10/723-MIPS-ath79-add-om5p-support.patch b/target/linux/ar71xx/patches-3.10/723-MIPS-ath79-add-om5p-support.patch index 6ff82d89b9..e5ce232b89 100644 --- a/target/linux/ar71xx/patches-3.10/723-MIPS-ath79-add-om5p-support.patch +++ b/target/linux/ar71xx/patches-3.10/723-MIPS-ath79-add-om5p-support.patch @@ -1,6 +1,6 @@ --- a/arch/mips/ath79/machtypes.h +++ b/arch/mips/ath79/machtypes.h -@@ -70,6 +70,7 @@ enum ath79_mach_type { +@@ -76,6 +76,7 @@ enum ath79_mach_type { ATH79_MACH_OM2P_LC, /* OpenMesh OM2P-LC */ ATH79_MACH_OM2Pv2, /* OpenMesh OM2Pv2 */ ATH79_MACH_OM2P, /* OpenMesh OM2P */ @@ -10,7 +10,7 @@ ATH79_MACH_RB_411, /* MikroTik RouterBOARD 411/411A/411AH */ --- a/arch/mips/ath79/Kconfig +++ b/arch/mips/ath79/Kconfig -@@ -511,6 +511,15 @@ config ATH79_MACH_OM2P +@@ -587,6 +587,15 @@ config ATH79_MACH_OM2P select ATH79_DEV_M25P80 select ATH79_DEV_WMAC @@ -28,7 +28,7 @@ select SOC_AR934X --- a/arch/mips/ath79/Makefile +++ b/arch/mips/ath79/Makefile -@@ -75,6 +75,7 @@ obj-$(CONFIG_ATH79_MACH_MZK_W04NU) += ma +@@ -81,6 +81,7 @@ obj-$(CONFIG_ATH79_MACH_MZK_W04NU) += ma obj-$(CONFIG_ATH79_MACH_MZK_W300NH) += mach-mzk-w300nh.o obj-$(CONFIG_ATH79_MACH_NBG460N) += mach-nbg460n.o obj-$(CONFIG_ATH79_MACH_OM2P) += mach-om2p.o diff --git a/target/linux/ar71xx/patches-3.10/902-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-3.10/902-unaligned_access_hacks.patch index 17c6be717c..121276a6a1 100644 --- a/target/linux/ar71xx/patches-3.10/902-unaligned_access_hacks.patch +++ b/target/linux/ar71xx/patches-3.10/902-unaligned_access_hacks.patch @@ -328,7 +328,7 @@ --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c -@@ -1272,9 +1272,9 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str +@@ -1273,9 +1273,9 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str dsfield = ipv6_get_dsfield(ipv6h); if (t->parms.flags & IP6_TNL_F_USE_ORIG_TCLASS) @@ -886,7 +886,7 @@ tpi->seq = 0; --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c -@@ -3625,14 +3625,16 @@ static bool tcp_parse_aligned_timestamp( +@@ -3624,14 +3624,16 @@ static bool tcp_parse_aligned_timestamp( { const __be32 *ptr = (const __be32 *)(th + 1); |