diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-09-11 10:48:34 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-09-11 10:48:34 +0000 |
| commit | 8cb7552c46cff627eb8179ccc4c071f98563ec16 (patch) | |
| tree | 3f1fc9b02283adde7d5fa27f892a30612e741a35 /target/linux/ar71xx | |
| parent | 0dc3d0e7c74bf8d50c3a2bfc335e5e717ab4051f (diff) | |
| download | upstream-8cb7552c46cff627eb8179ccc4c071f98563ec16.tar.gz upstream-8cb7552c46cff627eb8179ccc4c071f98563ec16.tar.bz2 upstream-8cb7552c46cff627eb8179ccc4c071f98563ec16.zip | |
CC: kernel: update 3.18 to 3.18.21
Changelog:
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.21
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46847 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx')
| -rw-r--r-- | target/linux/ar71xx/patches-3.18/902-unaligned_access_hacks.patch | 2 | ||||
| -rw-r--r-- | target/linux/ar71xx/patches-3.18/906-MIPS-ath79-add-blackswift.patch | 24 |
2 files changed, 10 insertions, 16 deletions
diff --git a/target/linux/ar71xx/patches-3.18/902-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-3.18/902-unaligned_access_hacks.patch index 6b6c0f2d3f..21fdd67ae3 100644 --- a/target/linux/ar71xx/patches-3.18/902-unaligned_access_hacks.patch +++ b/target/linux/ar71xx/patches-3.18/902-unaligned_access_hacks.patch @@ -822,7 +822,7 @@ | TCPOLEN_TIMESTAMP)) --- a/net/xfrm/xfrm_input.c +++ b/net/xfrm/xfrm_input.c -@@ -152,8 +152,8 @@ int xfrm_parse_spi(struct sk_buff *skb, +@@ -154,8 +154,8 @@ int xfrm_parse_spi(struct sk_buff *skb, if (!pskb_may_pull(skb, hlen)) return -EINVAL; diff --git a/target/linux/ar71xx/patches-3.18/906-MIPS-ath79-add-blackswift.patch b/target/linux/ar71xx/patches-3.18/906-MIPS-ath79-add-blackswift.patch index 15196bba98..3b5aa54f41 100644 --- a/target/linux/ar71xx/patches-3.18/906-MIPS-ath79-add-blackswift.patch +++ b/target/linux/ar71xx/patches-3.18/906-MIPS-ath79-add-blackswift.patch @@ -1,8 +1,6 @@ -Index: linux-3.18.19/arch/mips/ath79/Kconfig -=================================================================== ---- linux-3.18.19.orig/arch/mips/ath79/Kconfig 2015-08-10 17:08:03.191320098 +0100 -+++ linux-3.18.19/arch/mips/ath79/Kconfig 2015-08-10 17:08:03.195320098 +0100 -@@ -866,6 +866,16 @@ +--- a/arch/mips/ath79/Kconfig ++++ b/arch/mips/ath79/Kconfig +@@ -866,6 +866,16 @@ config ATH79_MACH_EAP7660D select ATH79_DEV_LEDS_GPIO select ATH79_DEV_M25P80 @@ -19,11 +17,9 @@ Index: linux-3.18.19/arch/mips/ath79/Kconfig config ATH79_MACH_ARCHER_C7 bool "TP-LINK Archer C5/C7/TL-WDR4900 v2 board support" select SOC_QCA955X -Index: linux-3.18.19/arch/mips/ath79/Makefile -=================================================================== ---- linux-3.18.19.orig/arch/mips/ath79/Makefile 2015-08-10 17:08:03.191320098 +0100 -+++ linux-3.18.19/arch/mips/ath79/Makefile 2015-08-10 17:08:03.195320098 +0100 -@@ -54,6 +54,7 @@ +--- a/arch/mips/ath79/Makefile ++++ b/arch/mips/ath79/Makefile +@@ -54,6 +54,7 @@ obj-$(CONFIG_ATH79_MACH_AP96) += mach-a obj-$(CONFIG_ATH79_MACH_ARCHER_C7) += mach-archer-c7.o obj-$(CONFIG_ATH79_MACH_AW_NR580) += mach-aw-nr580.o obj-$(CONFIG_ATH79_MACH_BHU_BXU2000N2_A)+= mach-bhu-bxu2000n2-a.o @@ -31,11 +27,9 @@ Index: linux-3.18.19/arch/mips/ath79/Makefile obj-$(CONFIG_ATH79_MACH_CAP4200AG) += mach-cap4200ag.o obj-$(CONFIG_ATH79_MACH_CPE510) += mach-cpe510.o obj-$(CONFIG_ATH79_MACH_DB120) += mach-db120.o -Index: linux-3.18.19/arch/mips/ath79/machtypes.h -=================================================================== ---- linux-3.18.19.orig/arch/mips/ath79/machtypes.h 2015-08-10 17:08:03.191320098 +0100 -+++ linux-3.18.19/arch/mips/ath79/machtypes.h 2015-08-10 17:10:41.455317386 +0100 -@@ -37,6 +37,7 @@ +--- a/arch/mips/ath79/machtypes.h ++++ b/arch/mips/ath79/machtypes.h +@@ -37,6 +37,7 @@ enum ath79_mach_type { ATH79_MACH_ARCHER_C7, /* TP-LINK Archer C7 board */ ATH79_MACH_AW_NR580, /* AzureWave AW-NR580 */ ATH79_MACH_BHU_BXU2000N2_A1, /* BHU BXU2000n-2 A1 */ |