From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 8 Sep 2015 14:29:55 +0000 (+0000)
Subject: kernel: restore 640-bridge_no_eap_forward.patch to its original form
X-Git-Tag: reboot~2108
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=75744d133d3cd8a81642be885b497d821991000b

kernel: restore 640-bridge_no_eap_forward.patch to its original form

It was corrupted in r38528. The most obvious symptom is repeated messages like this:

Tue Sep  8 08:25:18 2015 kern.warn kernel: [77141.972226] br-lan: received packet on wlan0 with own address as source address

Signed-off-by: Dmitry Ivanov <dima@ubnt.com>

SVN-Revision: 46821
---

diff --git a/target/linux/generic/patches-3.18/640-bridge_no_eap_forward.patch b/target/linux/generic/patches-3.18/640-bridge_no_eap_forward.patch
index acbf1e206e..69a994934a 100644
--- a/target/linux/generic/patches-3.18/640-bridge_no_eap_forward.patch
+++ b/target/linux/generic/patches-3.18/640-bridge_no_eap_forward.patch
@@ -8,7 +8,7 @@
 +	if (skb->protocol == htons(ETH_P_PAE)) {
 +		skb2 = skb;
 +		/* Do not forward 802.1x/EAP frames */
-+
++		skb = NULL;
 +	} else if (is_broadcast_ether_addr(dest)) {
  		skb2 = skb;
  		unicast = false;
diff --git a/target/linux/generic/patches-4.0/640-bridge_no_eap_forward.patch b/target/linux/generic/patches-4.0/640-bridge_no_eap_forward.patch
index 7a9dc26a7b..c9b8613e7b 100644
--- a/target/linux/generic/patches-4.0/640-bridge_no_eap_forward.patch
+++ b/target/linux/generic/patches-4.0/640-bridge_no_eap_forward.patch
@@ -8,7 +8,7 @@
 +	if (skb->protocol == htons(ETH_P_PAE)) {
 +		skb2 = skb;
 +		/* Do not forward 802.1x/EAP frames */
-+
++		skb = NULL;
 +	} else if (is_broadcast_ether_addr(dest)) {
  		if (IS_ENABLED(CONFIG_INET) &&
  		    p->flags & BR_PROXYARP &&
diff --git a/target/linux/generic/patches-4.1/640-bridge_no_eap_forward.patch b/target/linux/generic/patches-4.1/640-bridge_no_eap_forward.patch
index 283bc85a9c..d3871eb299 100644
--- a/target/linux/generic/patches-4.1/640-bridge_no_eap_forward.patch
+++ b/target/linux/generic/patches-4.1/640-bridge_no_eap_forward.patch
@@ -8,7 +8,7 @@
 +	if (skb->protocol == htons(ETH_P_PAE)) {
 +		skb2 = skb;
 +		/* Do not forward 802.1x/EAP frames */
-+
++		skb = NULL;
 +	} else if (is_broadcast_ether_addr(dest)) {
  		skb2 = skb;
  		unicast = false;