diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-04-29 13:01:53 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-05-02 12:59:26 +0200 |
| commit | b765f4be407ca407c8f446a0970aab8e7e93bffb (patch) | |
| tree | c7fa07cd13ad6e5bb380a14a7c7e4e5f49d383b0 /target/linux/generic/pending-4.14/150-bridge_allow_receiption_on_disabled_port.patch | |
| parent | 456f486b53a7cbe7035dca7323f6b5fdb58be444 (diff) | |
| download | upstream-b765f4be407ca407c8f446a0970aab8e7e93bffb.tar.gz upstream-b765f4be407ca407c8f446a0970aab8e7e93bffb.tar.bz2 upstream-b765f4be407ca407c8f446a0970aab8e7e93bffb.zip | |
kernel: bump 4.14 to 4.14.114
Refreshed all patches.
Altered patches:
- 150-bridge_allow_receiption_on_disabled_port.patch
- 201-extra_optimization.patch
Remove upstreamed:
- 022-0006-crypto-crypto4xx-properly-set-IV-after-de-and-encryp.patch
Compile-tested on: ar71xx, cns3xxx, imx6, x86_64
Runtime-tested on: ar71xx, cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/pending-4.14/150-bridge_allow_receiption_on_disabled_port.patch')
| -rw-r--r-- | target/linux/generic/pending-4.14/150-bridge_allow_receiption_on_disabled_port.patch | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/target/linux/generic/pending-4.14/150-bridge_allow_receiption_on_disabled_port.patch b/target/linux/generic/pending-4.14/150-bridge_allow_receiption_on_disabled_port.patch index 9fcffdee06..4a53161477 100644 --- a/target/linux/generic/pending-4.14/150-bridge_allow_receiption_on_disabled_port.patch +++ b/target/linux/generic/pending-4.14/150-bridge_allow_receiption_on_disabled_port.patch @@ -15,17 +15,19 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c -@@ -239,7 +239,8 @@ static int br_handle_local_finish(struct +@@ -237,7 +237,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); -@@ -327,6 +328,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; +@@ -332,6 +335,15 @@ rx_handler_result_t br_handle_frame(stru forward: switch (p->state) { |