diff mbox

[OpenWrt-Devel] Restore 640-bridge_no_eap_forward.patch to its original form

Message ID 20150908153108.d88e6085223c719530f2622c@ubnt.com
State Accepted
Headers show

Commit Message

Dmitry Ivanov Sept. 8, 2015, 12:31 p.m. UTC
Restore 640-bridge_no_eap_forward.patch to its original form.
It was corrupted in rev 62a2176cb144. 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>
---
 target/linux/generic/patches-3.18/640-bridge_no_eap_forward.patch | 2 +-
 target/linux/generic/patches-4.0/640-bridge_no_eap_forward.patch  | 2 +-
 target/linux/generic/patches-4.1/640-bridge_no_eap_forward.patch  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Comments

Jonas Gorski Sept. 8, 2015, 12:35 p.m. UTC | #1
Hi,

On Tue, Sep 8, 2015 at 2:31 PM, Dmitry Ivanov <dmitrijs.ivanovs@ubnt.com> wrote:
> Restore 640-bridge_no_eap_forward.patch to its original form.
> It was corrupted in rev 62a2176cb144. The most obvious symptom is repeated messages like this:

Please state the svn revision and/or the commit subject in () to make
it easier to find the offending commit.

>
> 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>

Jonas
Hannu Nyman Sept. 8, 2015, 1:16 p.m. UTC | #2
> Please state the svn revision and/or the commit subject in () to make > it 
easier to find the offending commit.

The "offending commit" seems to be r38528 , the introduction of Linux 3.12.

https://dev.openwrt.org/changeset/38528
https://dev.openwrt.org/changeset/38528#file55

http://git.openwrt.org/?p=openwrt.git;a=commit;h=62a2176cb1446f865b58299f080493f26ce53573
Felix Fietkau Sept. 8, 2015, 2:31 p.m. UTC | #3
On 2015-09-08 14:31, Dmitry Ivanov wrote:
> Restore 640-bridge_no_eap_forward.patch to its original form.
> It was corrupted in rev 62a2176cb144. 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>
Applied in r46821. Next time, please don't repeat the subject in the
message body, and add a prefix like "kernel: ".

Thanks,

- Felix
diff mbox

Patch

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 acbf1e2..69a9949 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 7a9dc26..c9b8613 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 283bc85..d3871eb 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;