From: Felix Fietkau Date: Sat, 27 Sep 2014 20:51:49 +0000 (+0000) Subject: ar71xx: refresh 3.14 kernel patches X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=84d81d5844abd49cbf8534bc0e5723f429e1caa6;p=openwrt%2Fstaging%2Frmilecki.git ar71xx: refresh 3.14 kernel patches Signed-off-by: Felix Fietkau SVN-Revision: 42684 --- diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile index 1b400745d1b..c8289030056 100644 --- a/target/linux/ar71xx/Makefile +++ b/target/linux/ar71xx/Makefile @@ -13,7 +13,7 @@ FEATURES:=mips16 CPU_TYPE=34kc SUBTARGETS:=generic nand mikrotik -LINUX_VERSION:=3.10.49 +LINUX_VERSION:=3.14.18 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ar71xx/patches-3.14/404-mtd-wrt160nl-trx-parser.patch b/target/linux/ar71xx/patches-3.14/404-mtd-wrt160nl-trx-parser.patch index 23d78186cab..78adf4f8bd6 100644 --- a/target/linux/ar71xx/patches-3.14/404-mtd-wrt160nl-trx-parser.patch +++ b/target/linux/ar71xx/patches-3.14/404-mtd-wrt160nl-trx-parser.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig -@@ -212,6 +212,12 @@ config MTD_BCM47XX_PARTS +@@ -189,6 +189,12 @@ config MTD_BCM47XX_PARTS This provides partitions parser for devices based on BCM47xx boards. diff --git a/target/linux/ar71xx/patches-3.14/405-mtd-tp-link-partition-parser.patch b/target/linux/ar71xx/patches-3.14/405-mtd-tp-link-partition-parser.patch index a26f3c3a5c9..fb60245b571 100644 --- a/target/linux/ar71xx/patches-3.14/405-mtd-tp-link-partition-parser.patch +++ b/target/linux/ar71xx/patches-3.14/405-mtd-tp-link-partition-parser.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig -@@ -214,7 +214,7 @@ config MTD_BCM47XX_PARTS +@@ -191,7 +191,7 @@ config MTD_BCM47XX_PARTS config MTD_WRT160NL_PARTS tristate "Linksys WRT160NL partitioning support" @@ -9,7 +9,7 @@ ---help--- Linksys WRT160NL partitioning support -@@ -234,6 +234,12 @@ config MTD_MYLOADER_PARTS +@@ -211,6 +211,12 @@ config MTD_MYLOADER_PARTS You will still need the parsing functions to be called by the driver for your particular device. It won't happen automatically. diff --git a/target/linux/ar71xx/patches-3.14/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.14/610-MIPS-ath79-openwrt-machines.patch index cba18a88c78..60df54cf242 100644 --- a/target/linux/ar71xx/patches-3.14/610-MIPS-ath79-openwrt-machines.patch +++ b/target/linux/ar71xx/patches-3.14/610-MIPS-ath79-openwrt-machines.patch @@ -209,13 +209,13 @@ config ATH79_MACH_AP121 bool "Atheros AP121 reference board" select SOC_AR933X -@@ -9,64 +64,736 @@ config ATH79_MACH_AP121 - select ATH79_DEV_GPIO_BUTTONS - select ATH79_DEV_LEDS_GPIO +@@ -11,62 +66,734 @@ config ATH79_MACH_AP121 select ATH79_DEV_M25P80 -- select ATH79_DEV_USB -+ select ATH79_DEV_USB -+ select ATH79_DEV_WMAC + select ATH79_DEV_USB + select ATH79_DEV_WMAC +- help +- Say 'Y' here if you want your kernel to support the +- Atheros AP121 reference board. + help + Say 'Y' here if you want your kernel to support the + Atheros AP121 reference board. @@ -678,13 +678,8 @@ + select ATH79_DEV_GPIO_BUTTONS + select ATH79_DEV_LEDS_GPIO + select ATH79_DEV_M25P80 - select ATH79_DEV_WMAC -- help -- Say 'Y' here if you want your kernel to support the -- Atheros AP121 reference board. - --config ATH79_MACH_AP136 -- bool "Atheros AP136/AP135 reference board" ++ select ATH79_DEV_WMAC ++ +config ATH79_MACH_EAP7660D + bool "Senao EAP7660D support" + select SOC_AR71XX @@ -695,21 +690,14 @@ + +config ATH79_MACH_ARCHER_C7 + bool "TP-LINK Archer C7 board support" - select SOC_QCA955X ++ select SOC_QCA955X + select ATH79_DEV_ETH - select ATH79_DEV_GPIO_BUTTONS - select ATH79_DEV_LEDS_GPIO -- select ATH79_DEV_NFC -- select ATH79_DEV_SPI ++ select ATH79_DEV_GPIO_BUTTONS ++ select ATH79_DEV_LEDS_GPIO + select ATH79_DEV_M25P80 - select ATH79_DEV_USB - select ATH79_DEV_WMAC -- help -- Say 'Y' here if you want your kernel to support the -- Atheros AP136 or AP135 reference boards. - --config ATH79_MACH_AP81 -- bool "Atheros AP81 reference board" ++ select ATH79_DEV_USB ++ select ATH79_DEV_WMAC ++ +config ATH79_MACH_TL_MR11U + bool "TP-LINK TL-MR11U/TL-MR3040 support" + select SOC_AR933X @@ -719,17 +707,27 @@ + select ATH79_DEV_M25P80 + select ATH79_DEV_USB + select ATH79_DEV_WMAC -+ + +-config ATH79_MACH_AP136 +- bool "Atheros AP136/AP135 reference board" +- select SOC_QCA955X +config ATH79_MACH_TL_MR13U + bool "TP-LINK TL-MR13U support" + select SOC_AR933X + select ATH79_DEV_ETH -+ select ATH79_DEV_GPIO_BUTTONS -+ select ATH79_DEV_LEDS_GPIO + select ATH79_DEV_GPIO_BUTTONS + select ATH79_DEV_LEDS_GPIO +- select ATH79_DEV_NFC +- select ATH79_DEV_SPI + select ATH79_DEV_M25P80 -+ select ATH79_DEV_USB -+ select ATH79_DEV_WMAC -+ + select ATH79_DEV_USB + select ATH79_DEV_WMAC +- help +- Say 'Y' here if you want your kernel to support the +- Atheros AP136 or AP135 reference boards. + +-config ATH79_MACH_AP81 +- bool "Atheros AP81 reference board" +config ATH79_MACH_TL_MR3020 + bool "TP-LINK TL-MR3020 support" + select SOC_AR933X @@ -853,9 +851,10 @@ + bool "TP-LINK TL-WR841N v1 support" select SOC_AR71XX + select ATH79_DEV_DSA -+ select ATH79_DEV_ETH -+ select ATH79_DEV_GPIO_BUTTONS -+ select ATH79_DEV_LEDS_GPIO + select ATH79_DEV_ETH + select ATH79_DEV_GPIO_BUTTONS + select ATH79_DEV_LEDS_GPIO +- select ATH79_DEV_SPI + select ATH79_DEV_M25P80 + +config ATH79_MACH_TL_WR841N_V8 @@ -902,15 +901,11 @@ +config ATH79_MACH_TL_WR1043ND_V2 + bool "TP-LINK TL-WR1043ND v2 support" + select SOC_QCA955X - select ATH79_DEV_ETH - select ATH79_DEV_GPIO_BUTTONS - select ATH79_DEV_LEDS_GPIO -- select ATH79_DEV_SPI ++ select ATH79_DEV_ETH ++ select ATH79_DEV_GPIO_BUTTONS ++ select ATH79_DEV_LEDS_GPIO + select ATH79_DEV_M25P80 - select ATH79_DEV_USB -- help -- Say 'Y' here if you want your kernel to support the -- Atheros PB44 reference board. ++ select ATH79_DEV_USB + select ATH79_DEV_WMAC + +config ATH79_MACH_TL_WR2543N @@ -970,7 +965,10 @@ + select ATH79_DEV_GPIO_BUTTONS + select ATH79_DEV_LEDS_GPIO + select ATH79_DEV_M25P80 -+ select ATH79_DEV_USB + select ATH79_DEV_USB +- help +- Say 'Y' here if you want your kernel to support the +- Atheros PB44 reference board. config ATH79_MACH_UBNT_XM bool "Ubiquiti Networks XM/UniFi boards" diff --git a/target/linux/ar71xx/patches-3.14/726-MIPS-ath79-add-qihoo-360-c301-support.patch b/target/linux/ar71xx/patches-3.14/726-MIPS-ath79-add-qihoo-360-c301-support.patch index 6be83b0bb07..c815b147673 100644 --- a/target/linux/ar71xx/patches-3.14/726-MIPS-ath79-add-qihoo-360-c301-support.patch +++ b/target/linux/ar71xx/patches-3.14/726-MIPS-ath79-add-qihoo-360-c301-support.patch @@ -1,6 +1,6 @@ --- a/arch/mips/ath79/Kconfig +++ b/arch/mips/ath79/Kconfig -@@ -1034,6 +1034,17 @@ +@@ -1034,6 +1034,17 @@ config ATH79_MACH_BHU_BXU2000N2_A select ATH79_DEV_USB select ATH79_DEV_WMAC @@ -20,7 +20,7 @@ config SOC_AR71XX --- a/arch/mips/ath79/machtypes.h +++ b/arch/mips/ath79/machtypes.h -@@ -80,6 +80,7 @@ +@@ -80,6 +80,7 @@ enum ath79_mach_type { ATH79_MACH_OM5P, /* OpenMesh OM5P */ ATH79_MACH_PB42, /* Atheros PB42 */ ATH79_MACH_PB92, /* Atheros PB92 */ @@ -30,7 +30,7 @@ ATH79_MACH_RB_433, /* MikroTik RouterBOARD 433/433AH */ --- a/arch/mips/ath79/Makefile +++ b/arch/mips/ath79/Makefile -@@ -85,6 +85,7 @@ +@@ -85,6 +85,7 @@ obj-$(CONFIG_ATH79_MACH_OM5P) += mach-o obj-$(CONFIG_ATH79_MACH_PB42) += mach-pb42.o obj-$(CONFIG_ATH79_MACH_PB44) += mach-pb44.o obj-$(CONFIG_ATH79_MACH_PB92) += mach-pb92.o diff --git a/target/linux/ar71xx/patches-3.14/902-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-3.14/902-unaligned_access_hacks.patch index 09c27ea83f4..7c1e6b0576c 100644 --- a/target/linux/ar71xx/patches-3.14/902-unaligned_access_hacks.patch +++ b/target/linux/ar71xx/patches-3.14/902-unaligned_access_hacks.patch @@ -385,7 +385,7 @@ for (p = *head; p; p = p->next) { --- a/net/ipv4/route.c +++ b/net/ipv4/route.c -@@ -459,7 +459,7 @@ static struct neighbour *ipv4_neigh_look +@@ -460,7 +460,7 @@ static struct neighbour *ipv4_neigh_look else if (skb) pkey = &ip_hdr(skb)->daddr; @@ -741,7 +741,7 @@ if (xb) return i * 32 + 31 - __fls(ntohl(xb)); } -@@ -670,12 +674,13 @@ int ip6_dst_hoplimit(struct dst_entry *d +@@ -668,12 +672,13 @@ int ip6_dst_hoplimit(struct dst_entry *d static inline void ip6_flow_hdr(struct ipv6hdr *hdr, unsigned int tclass, __be32 flowlabel) { @@ -765,8 +765,8 @@ #include +#include - __u32 secure_ip_id(__be32 daddr); - __u32 secure_ipv6_id(const __be32 daddr[4]); + u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport); + u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr, --- a/include/uapi/linux/in.h +++ b/include/uapi/linux/in.h @@ -78,7 +78,7 @@ enum { @@ -808,7 +808,7 @@ secret[4] = net_secret[4] + (__force u32)dport; for (i = 5; i < MD5_MESSAGE_BYTES / 4; i++) secret[i] = net_secret[i]; -@@ -175,11 +177,12 @@ u64 secure_dccpv6_sequence_number(__be32 +@@ -150,11 +152,12 @@ u64 secure_dccpv6_sequence_number(__be32 u32 hash[MD5_DIGEST_WORDS]; u64 seq; u32 i;