diff options
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/generic/pending-4.14/150-bridge_allow_receiption_on_disabled_port.patch | 8 | ||||
| -rw-r--r-- | target/linux/generic/pending-4.9/150-bridge_allow_receiption_on_disabled_port.patch | 8 |
2 files changed, 10 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 4a53161477..d50280a881 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 @@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> /* 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 +@@ -332,6 +335,17 @@ rx_handler_result_t br_handle_frame(stru forward: switch (p->state) { @@ -35,9 +35,11 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> + if (ether_addr_equal(p->br->dev->dev_addr, dest)) + skb->pkt_type = PACKET_HOST; + -+ NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, ++ if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, + dev_net(skb->dev), NULL, skb, skb->dev, NULL, -+ br_handle_local_finish); ++ br_handle_local_finish) == 1) { ++ return RX_HANDLER_PASS; ++ } + break; + case BR_STATE_FORWARDING: 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 c62eea3124..9ee93c9a1d 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 @@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> /* 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 +@@ -321,6 +324,17 @@ rx_handler_result_t br_handle_frame(stru forward: switch (p->state) { @@ -35,9 +35,11 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> + if (ether_addr_equal(p->br->dev->dev_addr, dest)) + skb->pkt_type = PACKET_HOST; + -+ NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, ++ if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, + dev_net(skb->dev), NULL, skb, skb->dev, NULL, -+ br_handle_local_finish); ++ br_handle_local_finish) == 1) { ++ return RX_HANDLER_PASS; ++ } + break; + case BR_STATE_FORWARDING: |