ath79: fix incorrect identation in qca9557.dtsi

[oweals/openwrt.git] / target / linux / generic / pending-4.19 / 150-bridge_allow_receiption_on_disabled_port.patch

diff --git a/target/linux/generic/pending-4.19/150-bridge_allow_receiption_on_disabled_port.patch b/target/linux/generic/pending-4.19/150-bridge_allow_receiption_on_disabled_port.patch
index c8e68c2c9685d324ab2af4bd2d83355b3b1f1957..583c34a448298b1dba23c561825b7126d6415c14 100644 (file)
--- a/target/linux/generic/pending-4.19/150-bridge_allow_receiption_on_disabled_port.patch
+++ b/target/linux/generic/pending-4.19/150-bridge_allow_receiption_on_disabled_port.patch
@@ -15,17 +15,17 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/net/bridge/br_input.c
 +++ b/net/bridge/br_input.c
-@@ -197,7 +197,8 @@ static int br_handle_local_finish(struct
+@@ -193,6 +193,9 @@ 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_handle_local_finish(skb);
  
-       BR_INPUT_SKB_CB(skb)->brdev = p->br->dev;
-       br_pass_frame_up(skb);
-@@ -286,6 +287,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 */
+@@ -289,6 +292,17 @@ rx_handler_result_t br_handle_frame(stru
  
  forward:
        switch (p->state) {
@@ -33,9 +33,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: