kernel: Make the patches apply on top of 4.19
[openwrt/staging/chunkeey.git] / target / linux / generic / hack-4.19 / 640-bridge-only-accept-EAP-locally.patch
index 0dbb8ee3c0a43fdccb7a78c85e61ef03eda9af1b..981d49b9c02b2c0fcba170e587654787f9a81c22 100644 (file)
@@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/net/bridge/br_input.c
 +++ b/net/bridge/br_input.c
-@@ -166,10 +166,14 @@ int br_handle_frame_finish(struct net *n
+@@ -110,10 +110,14 @@ int br_handle_frame_finish(struct net *n
                }
        }
  
@@ -28,4 +28,4 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 -      BR_INPUT_SKB_CB(skb)->brdev = br->dev;
        BR_INPUT_SKB_CB(skb)->src_port_isolated = !!(p->flags & BR_ISOLATED);
  
-       if (IS_ENABLED(CONFIG_INET) && skb->protocol == htons(ETH_P_ARP))
+       if (IS_ENABLED(CONFIG_INET) &&