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 acbf1e206e5cc06f0addf66511c3b82cbc588d5c..69a994934ae6ed50b476215caa1d6c637e7b6858 100644 (file)
--- 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 7a9dc26a7b2b65679c8de95808a6fee8e396ef7e..c9b8613e7b83b36adc72bad03e77af8da8fa45c6 100644 (file)
--- 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 283bc85a9c13e6f6120b5ffaa04fc03c2189647c..d3871eb2999256eb1f776f219b8d2af4c64c7a8c 100644 (file)
--- 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;