From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
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-Url: https://git.archive.openwrt.org/?a=commitdiff_plain;h=96bcd4b8ff13c16504c970d365f739955f02ac68;p=openwrt.git

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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46821 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

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;