From 456f486b53a7cbe7035dca7323f6b5fdb58be444 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Mon, 29 Apr 2019 12:05:49 +0200 Subject: kernel: bump 4.9 to 4.9.171 Refreshed all patches. Altered patches: - 150-bridge_allow_receiption_on_disabled_port.patch - 201-extra_optimization.patch Compile-tested on: ar7 Runtime-tested on: none Signed-off-by: Koen Vandeputte --- .../150-bridge_allow_receiption_on_disabled_port.patch | 14 ++++++++------ .../linux/generic/pending-4.9/201-extra_optimization.patch | 8 ++++---- 2 files changed, 12 insertions(+), 10 deletions(-) (limited to 'target/linux/generic/pending-4.9') diff --git a/target/linux/generic/pending-4.9/150-bridge_allow_receiption_on_disabled_port.patch b/target/linux/generic/pending-4.9/150-bridge_allow_receiption_on_disabled_port.patch index a164f6e7ea..c62eea3124 100644 --- a/target/linux/generic/pending-4.9/150-bridge_allow_receiption_on_disabled_port.patch +++ b/target/linux/generic/pending-4.9/150-bridge_allow_receiption_on_disabled_port.patch @@ -15,17 +15,19 @@ Signed-off-by: Felix Fietkau --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c -@@ -233,7 +233,8 @@ static int br_handle_local_finish(struct +@@ -231,7 +231,10 @@ static void __br_handle_local_finish(str + /* note: already called with rcu_read_lock */ + static int br_handle_local_finish(struct net *net, struct sock *sk, struct sk_buff *skb) { - struct net_bridge_port *p = br_port_get_rcu(skb->dev); - - __br_handle_local_finish(skb); ++ struct net_bridge_port *p = br_port_get_rcu(skb->dev); ++ + if (p->state != BR_STATE_DISABLED) + __br_handle_local_finish(skb); - BR_INPUT_SKB_CB(skb)->brdev = p->br->dev; - br_pass_frame_up(skb); -@@ -316,6 +317,15 @@ rx_handler_result_t br_handle_frame(stru + /* return 1 to signal the okfn() was called so it's ok to use the skb */ + return 1; +@@ -321,6 +324,15 @@ rx_handler_result_t br_handle_frame(stru forward: switch (p->state) { diff --git a/target/linux/generic/pending-4.9/201-extra_optimization.patch b/target/linux/generic/pending-4.9/201-extra_optimization.patch index 7b6397919e..3d0fc822bb 100644 --- a/target/linux/generic/pending-4.9/201-extra_optimization.patch +++ b/target/linux/generic/pending-4.9/201-extra_optimization.patch @@ -14,12 +14,12 @@ Signed-off-by: Felix Fietkau --- a/Makefile +++ b/Makefile -@@ -656,12 +656,12 @@ endif +@@ -655,12 +655,12 @@ KBUILD_CFLAGS += $(call cc-option,-fdata + endif ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE - KBUILD_CFLAGS += $(call cc-option,-Oz,-Os) --KBUILD_CFLAGS += $(call cc-disable-warning,maybe-uninitialized,) -+KBUILD_CFLAGS += $(call cc-disable-warning,maybe-uninitialized,) $(EXTRA_OPTIMIZATION) +-KBUILD_CFLAGS += -Os $(call cc-disable-warning,maybe-uninitialized,) ++KBUILD_CFLAGS += -Os $(call cc-disable-warning,maybe-uninitialized,) $(EXTRA_OPTIMIZATION) else ifdef CONFIG_PROFILE_ALL_BRANCHES -KBUILD_CFLAGS += -O2 $(call cc-disable-warning,maybe-uninitialized,) -- cgit v1.2.3