kernel: re-add bridge allow reception on disabled port

The "bridge allow reception on disabled port" implementation
was broken after these commits:

b765f4be407c ("kernel: bump 4.14 to 4.14.114")
456f486b53a7 ("kernel: bump 4.9 to 4.9.171")

This leads to issues when for example WDS is used, tied to a bridge:

[ 96.503771] wlan1: send auth to d4:5f:25:eb:09:82 (try 1/3)
[ 96.517956] wlan1: authenticated
[ 96.526209] wlan1: associate with d4:5f:25:eb:09:82 (try 1/3)
[ 97.086156] wlan1: associate with d4:5f:25:eb:09:82 (try 2/3)
[ 97.200919] wlan1: RX AssocResp from d4:5f:25:eb:09:82 (capab=0x11 status=0 aid=1)
[ 97.208706] wlan1: associated
[ 101.312913] wlan1: deauthenticated from d4:5f:25:eb:09:82 (Reason: 2=PREV_AUTH_NOT_VALID)

It seems upstream introduced a new patch, [1]
so we have to reimplement these patches properly:

target/linux/generic/pending-4.9/150-bridge_allow_receiption_on_disabled_port.patch
target/linux/generic/pending-4.14/150-bridge_allow_receiption_on_disabled_port.patch

[1] https://lkml.org/lkml/2019/4/24/1228

Fixes: b765f4be407c ("kernel: bump 4.14 to 4.14.114")
Fixes: 456f486b53a7 ("kernel: bump 4.9 to 4.9.171")
Signed-off-by: Chen Minqiang <ptpt52@gmail.com>
[updated commit message and title]
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>

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 4a53161477551b807c81d15c0e1095b8f52aa06a..d50280a8817f68c42ee609397b4b9fe42e04cbed 100644 (file)
--- 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 c62eea31246a1d4c7377386952bedbb72b0296e2..9ee93c9a1dd210f29f94d299723f5c1ab77b4660 100644 (file)
--- 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: