From 55557928c6a51c351c9b458e17848fd64acd7bda Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 10 Mar 2011 18:00:41 +0000 Subject: kernel: allow EAP frames to pass through bridges even in learning state - fixes issues with WDS git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26015 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../generic/patches-2.6.30/281-bridge_always_accept_eap.patch | 11 +++++++++++ .../generic/patches-2.6.32/271-bridge_always_accept_eap.patch | 11 +++++++++++ .../generic/patches-2.6.34/271-bridge_always_accept_eap.patch | 11 +++++++++++ .../generic/patches-2.6.35/271-bridge_always_accept_eap.patch | 11 +++++++++++ .../generic/patches-2.6.36/271-bridge_always_accept_eap.patch | 11 +++++++++++ .../generic/patches-2.6.37/271-bridge_always_accept_eap.patch | 11 +++++++++++ .../generic/patches-2.6.38/271-bridge_always_accept_eap.patch | 11 +++++++++++ 7 files changed, 77 insertions(+) create mode 100644 target/linux/generic/patches-2.6.30/281-bridge_always_accept_eap.patch create mode 100644 target/linux/generic/patches-2.6.32/271-bridge_always_accept_eap.patch create mode 100644 target/linux/generic/patches-2.6.34/271-bridge_always_accept_eap.patch create mode 100644 target/linux/generic/patches-2.6.35/271-bridge_always_accept_eap.patch create mode 100644 target/linux/generic/patches-2.6.36/271-bridge_always_accept_eap.patch create mode 100644 target/linux/generic/patches-2.6.37/271-bridge_always_accept_eap.patch create mode 100644 target/linux/generic/patches-2.6.38/271-bridge_always_accept_eap.patch (limited to 'target') diff --git a/target/linux/generic/patches-2.6.30/281-bridge_always_accept_eap.patch b/target/linux/generic/patches-2.6.30/281-bridge_always_accept_eap.patch new file mode 100644 index 000000000..e16a3f7bc --- /dev/null +++ b/target/linux/generic/patches-2.6.30/281-bridge_always_accept_eap.patch @@ -0,0 +1,11 @@ +--- a/net/bridge/br_input.c ++++ b/net/bridge/br_input.c +@@ -50,7 +50,7 @@ int br_handle_frame_finish(struct sk_buf + br = p->br; + br_fdb_update(br, p, eth_hdr(skb)->h_source); + +- if (p->state == BR_STATE_LEARNING) ++ if ((p->state == BR_STATE_LEARNING) && skb->protocol != htons(ETH_P_PAE)) + goto drop; + + /* The packet skb2 goes to the local host (NULL to skip). */ diff --git a/target/linux/generic/patches-2.6.32/271-bridge_always_accept_eap.patch b/target/linux/generic/patches-2.6.32/271-bridge_always_accept_eap.patch new file mode 100644 index 000000000..e16a3f7bc --- /dev/null +++ b/target/linux/generic/patches-2.6.32/271-bridge_always_accept_eap.patch @@ -0,0 +1,11 @@ +--- a/net/bridge/br_input.c ++++ b/net/bridge/br_input.c +@@ -50,7 +50,7 @@ int br_handle_frame_finish(struct sk_buf + br = p->br; + br_fdb_update(br, p, eth_hdr(skb)->h_source); + +- if (p->state == BR_STATE_LEARNING) ++ if ((p->state == BR_STATE_LEARNING) && skb->protocol != htons(ETH_P_PAE)) + goto drop; + + /* The packet skb2 goes to the local host (NULL to skip). */ diff --git a/target/linux/generic/patches-2.6.34/271-bridge_always_accept_eap.patch b/target/linux/generic/patches-2.6.34/271-bridge_always_accept_eap.patch new file mode 100644 index 000000000..af552c65e --- /dev/null +++ b/target/linux/generic/patches-2.6.34/271-bridge_always_accept_eap.patch @@ -0,0 +1,11 @@ +--- a/net/bridge/br_input.c ++++ b/net/bridge/br_input.c +@@ -56,7 +56,7 @@ int br_handle_frame_finish(struct sk_buf + br_multicast_rcv(br, p, skb)) + goto drop; + +- if (p->state == BR_STATE_LEARNING) ++ if ((p->state == BR_STATE_LEARNING) && skb->protocol != htons(ETH_P_PAE)) + goto drop; + + BR_INPUT_SKB_CB(skb)->brdev = br->dev; diff --git a/target/linux/generic/patches-2.6.35/271-bridge_always_accept_eap.patch b/target/linux/generic/patches-2.6.35/271-bridge_always_accept_eap.patch new file mode 100644 index 000000000..3e2d2df85 --- /dev/null +++ b/target/linux/generic/patches-2.6.35/271-bridge_always_accept_eap.patch @@ -0,0 +1,11 @@ +--- a/net/bridge/br_input.c ++++ b/net/bridge/br_input.c +@@ -58,7 +58,7 @@ int br_handle_frame_finish(struct sk_buf + br_multicast_rcv(br, p, skb)) + goto drop; + +- if (p->state == BR_STATE_LEARNING) ++ if ((p->state == BR_STATE_LEARNING) && skb->protocol != htons(ETH_P_PAE)) + goto drop; + + BR_INPUT_SKB_CB(skb)->brdev = br->dev; diff --git a/target/linux/generic/patches-2.6.36/271-bridge_always_accept_eap.patch b/target/linux/generic/patches-2.6.36/271-bridge_always_accept_eap.patch new file mode 100644 index 000000000..e9bcabe6f --- /dev/null +++ b/target/linux/generic/patches-2.6.36/271-bridge_always_accept_eap.patch @@ -0,0 +1,11 @@ +--- a/net/bridge/br_input.c ++++ b/net/bridge/br_input.c +@@ -60,7 +60,7 @@ int br_handle_frame_finish(struct sk_buf + br_multicast_rcv(br, p, skb)) + goto drop; + +- if (p->state == BR_STATE_LEARNING) ++ if ((p->state == BR_STATE_LEARNING) && skb->protocol != htons(ETH_P_PAE)) + goto drop; + + BR_INPUT_SKB_CB(skb)->brdev = br->dev; diff --git a/target/linux/generic/patches-2.6.37/271-bridge_always_accept_eap.patch b/target/linux/generic/patches-2.6.37/271-bridge_always_accept_eap.patch new file mode 100644 index 000000000..e9bcabe6f --- /dev/null +++ b/target/linux/generic/patches-2.6.37/271-bridge_always_accept_eap.patch @@ -0,0 +1,11 @@ +--- a/net/bridge/br_input.c ++++ b/net/bridge/br_input.c +@@ -60,7 +60,7 @@ int br_handle_frame_finish(struct sk_buf + br_multicast_rcv(br, p, skb)) + goto drop; + +- if (p->state == BR_STATE_LEARNING) ++ if ((p->state == BR_STATE_LEARNING) && skb->protocol != htons(ETH_P_PAE)) + goto drop; + + BR_INPUT_SKB_CB(skb)->brdev = br->dev; diff --git a/target/linux/generic/patches-2.6.38/271-bridge_always_accept_eap.patch b/target/linux/generic/patches-2.6.38/271-bridge_always_accept_eap.patch new file mode 100644 index 000000000..e9bcabe6f --- /dev/null +++ b/target/linux/generic/patches-2.6.38/271-bridge_always_accept_eap.patch @@ -0,0 +1,11 @@ +--- a/net/bridge/br_input.c ++++ b/net/bridge/br_input.c +@@ -60,7 +60,7 @@ int br_handle_frame_finish(struct sk_buf + br_multicast_rcv(br, p, skb)) + goto drop; + +- if (p->state == BR_STATE_LEARNING) ++ if ((p->state == BR_STATE_LEARNING) && skb->protocol != htons(ETH_P_PAE)) + goto drop; + + BR_INPUT_SKB_CB(skb)->brdev = br->dev; -- cgit v1.2.3