diff options
| author | Felix Fietkau <nbd@nbd.name> | 2018-07-04 20:14:08 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2018-12-18 09:45:59 +0100 |
| commit | e68e498ff35412daba861c9d6d8ebad8f22a6465 (patch) | |
| tree | a86330a561d19cb4348e283ee91793fb315457a3 /target/linux/generic/pending-4.14 | |
| parent | b06665b2052eac06cb5a2359e1d569cbeca72e91 (diff) | |
| download | upstream-e68e498ff35412daba861c9d6d8ebad8f22a6465.tar.gz upstream-e68e498ff35412daba861c9d6d8ebad8f22a6465.tar.bz2 upstream-e68e498ff35412daba861c9d6d8ebad8f22a6465.zip | |
kernel: replace bridge port isolate hack with upstream patch backport on 4.14
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(backported from 21ee8ce9b52f8ae4a6babf4032f71e2d4d56392b)
(rebased patches)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'target/linux/generic/pending-4.14')
| -rw-r--r-- | target/linux/generic/pending-4.14/150-bridge_allow_receiption_on_disabled_port.patch | 4 |
1 files changed, 2 insertions, 2 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 03267310a0..9fcffdee06 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,7 +15,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c -@@ -238,7 +238,8 @@ static int br_handle_local_finish(struct +@@ -239,7 +239,8 @@ static int br_handle_local_finish(struct { struct net_bridge_port *p = br_port_get_rcu(skb->dev); @@ -25,7 +25,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> BR_INPUT_SKB_CB(skb)->brdev = p->br->dev; br_pass_frame_up(skb); -@@ -326,6 +327,15 @@ rx_handler_result_t br_handle_frame(stru +@@ -327,6 +328,15 @@ rx_handler_result_t br_handle_frame(stru forward: switch (p->state) { |