diff options
| -rw-r--r-- | include/kernel-version.mk | 4 | ||||
| -rw-r--r-- | target/linux/ar7/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/brcm63xx/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/gemini/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/generic/patches-3.9/644-bridge_optimize_netfilter_hooks.patch | 4 | ||||
| -rw-r--r-- | target/linux/lantiq/patches-3.9/0010-NET-MIPS-lantiq-update-etop-driver-for-devicetree.patch | 8 |
6 files changed, 11 insertions, 11 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 0e7311b69d..188157a522 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -14,8 +14,8 @@ endif ifeq ($(LINUX_VERSION),3.8.13) LINUX_KERNEL_MD5SUM:=2af19d06cd47ec459519159cdd10542d endif -ifeq ($(LINUX_VERSION),3.9.10) - LINUX_KERNEL_MD5SUM:=2d69615f7074b952cfcb65f1356c0cc9 +ifeq ($(LINUX_VERSION),3.9.11) + LINUX_KERNEL_MD5SUM:=edbf88eb7f7d34dbd5d3887726790755 endif ifeq ($(LINUX_VERSION),3.10.1) LINUX_KERNEL_MD5SUM:=4c8ed240943c8750a89cc307637bd74d diff --git a/target/linux/ar7/Makefile b/target/linux/ar7/Makefile index 1ee72ae4e9..f4bac3c6d8 100644 --- a/target/linux/ar7/Makefile +++ b/target/linux/ar7/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs atm MAINTAINER:=Florian Fainelli <florian@openwrt.org> SUBTARGETS:=generic ac49x -LINUX_VERSION:=3.9.10 +LINUX_VERSION:=3.9.11 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/brcm63xx/Makefile b/target/linux/brcm63xx/Makefile index c2cbdf6c36..e76e152f0f 100644 --- a/target/linux/brcm63xx/Makefile +++ b/target/linux/brcm63xx/Makefile @@ -11,7 +11,7 @@ BOARD:=brcm63xx BOARDNAME:=Broadcom BCM63xx SUBTARGETS:=generic smp FEATURES:=squashfs usb atm pci pcmcia -LINUX_VERSION:=3.9.10 +LINUX_VERSION:=3.9.11 MAINTAINER:=Florian Fainelli <florian@openwrt.org> include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/gemini/Makefile b/target/linux/gemini/Makefile index daa46889a3..f0e802dba8 100644 --- a/target/linux/gemini/Makefile +++ b/target/linux/gemini/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs pci CFLAGS:=-Os -pipe -march=armv4 -mtune=fa526 -fno-caller-saves MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> -LINUX_VERSION:=3.9.10 +LINUX_VERSION:=3.9.11 KERNELNAME:="zImage" diff --git a/target/linux/generic/patches-3.9/644-bridge_optimize_netfilter_hooks.patch b/target/linux/generic/patches-3.9/644-bridge_optimize_netfilter_hooks.patch index 986b3f843b..64a980ebdd 100644 --- a/target/linux/generic/patches-3.9/644-bridge_optimize_netfilter_hooks.patch +++ b/target/linux/generic/patches-3.9/644-bridge_optimize_netfilter_hooks.patch @@ -48,8 +48,8 @@ return RX_HANDLER_CONSUMED; /* consumed by filter */ } else { @@ -224,7 +224,7 @@ forward: - if (!ether_addr_equal(p->br->dev->dev_addr, dest)) - goto drop; + if (ether_addr_equal(p->br->dev->dev_addr, dest)) + skb->pkt_type = PACKET_HOST; - if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL, + if (BR_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL, diff --git a/target/linux/lantiq/patches-3.9/0010-NET-MIPS-lantiq-update-etop-driver-for-devicetree.patch b/target/linux/lantiq/patches-3.9/0010-NET-MIPS-lantiq-update-etop-driver-for-devicetree.patch index adf34c9b19..6d1b22259a 100644 --- a/target/linux/lantiq/patches-3.9/0010-NET-MIPS-lantiq-update-etop-driver-for-devicetree.patch +++ b/target/linux/lantiq/patches-3.9/0010-NET-MIPS-lantiq-update-etop-driver-for-devicetree.patch @@ -276,17 +276,17 @@ Subject: [PATCH 10/22] NET: MIPS: lantiq: update etop driver for devicetree struct ltq_etop_priv *priv = netdev_priv(dev); - int i; + int mii_mode = priv->mii_mode; -+ -+ clk_enable(priv->clk_ppe); - ltq_pmu_enable(PMU_PPE); ++ clk_enable(priv->clk_ppe); + +- switch (priv->pldata->mii_mode) { + if (of_machine_is_compatible("lantiq,ar9")) { + ltq_etop_gbit_init(dev); + /* force the etops link to the gbit to MII */ + mii_mode = PHY_INTERFACE_MODE_MII; + } - -- switch (priv->pldata->mii_mode) { ++ + switch (mii_mode) { case PHY_INTERFACE_MODE_RMII: ltq_etop_w32_mask(ETOP_MII_MASK, |