From a89ef54d18ec58ec244816040be521c6953a1b28 Mon Sep 17 00:00:00 2001 From: Imre Kaloz Date: Mon, 31 Mar 2014 13:43:06 +0000 Subject: 3.14 final is out Signed-off-by: Imre Kaloz git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40352 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches-3.14/120-bridge_allow_receiption_on_disabled_port.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'target/linux/generic/patches-3.14/120-bridge_allow_receiption_on_disabled_port.patch') diff --git a/target/linux/generic/patches-3.14/120-bridge_allow_receiption_on_disabled_port.patch b/target/linux/generic/patches-3.14/120-bridge_allow_receiption_on_disabled_port.patch index 0daa509dc9..948d4eb18b 100644 --- a/target/linux/generic/patches-3.14/120-bridge_allow_receiption_on_disabled_port.patch +++ b/target/linux/generic/patches-3.14/120-bridge_allow_receiption_on_disabled_port.patch @@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c -@@ -144,11 +144,13 @@ drop: +@@ -145,11 +145,13 @@ drop: static int br_handle_local_finish(struct sk_buff *skb) { struct net_bridge_port *p = br_port_get_rcu(skb->dev); @@ -33,7 +33,7 @@ Signed-off-by: Felix Fietkau return 0; /* process further */ } -@@ -218,6 +220,18 @@ rx_handler_result_t br_handle_frame(stru +@@ -219,6 +221,18 @@ rx_handler_result_t br_handle_frame(stru forward: switch (p->state) { -- cgit v1.2.3