From abc694b463dd9c2f2c9a7b22c3191260b94b1f04 Mon Sep 17 00:00:00 2001 From: Luka Perkov Date: Fri, 27 Jun 2014 21:10:02 +0000 Subject: kernel: update 3.14 to 3.14.9 Signed-off-by: Luka Perkov SVN-Revision: 41362 --- .../120-bridge_allow_receiption_on_disabled_port.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'target/linux/generic/patches-3.14/120-bridge_allow_receiption_on_disabled_port.patch') diff --git a/target/linux/generic/patches-3.14/120-bridge_allow_receiption_on_disabled_port.patch b/target/linux/generic/patches-3.14/120-bridge_allow_receiption_on_disabled_port.patch index 948d4eb18b..d12f7a6c59 100644 --- a/target/linux/generic/patches-3.14/120-bridge_allow_receiption_on_disabled_port.patch +++ b/target/linux/generic/patches-3.14/120-bridge_allow_receiption_on_disabled_port.patch @@ -23,11 +23,11 @@ Signed-off-by: Felix Fietkau + if (p->state != BR_STATE_DISABLED) { + u16 vid = 0; -- br_vlan_get_tag(skb, &vid); -- if (p->flags & BR_LEARNING) +- /* check if vlan is allowed, to avoid spoofing */ +- if (p->flags & BR_LEARNING && br_should_learn(p, skb, &vid)) - br_fdb_update(p->br, p, eth_hdr(skb)->h_source, vid, false); -+ br_vlan_get_tag(skb, &vid); -+ if (p->flags & BR_LEARNING) ++ /* check if vlan is allowed, to avoid spoofing */ ++ if (p->flags & BR_LEARNING && br_should_learn(p, skb, &vid)) + br_fdb_update(p->br, p, eth_hdr(skb)->h_source, vid, false); + } return 0; /* process further */ -- cgit v1.2.3