diff options
| author | Luka Perkov <luka@openwrt.org> | 2014-06-27 21:10:02 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2014-06-27 21:10:02 +0000 |
| commit | b0eae8648b2d266210940cfe9be4c29f194406b7 (patch) | |
| tree | f4b99027235c6a92349cb43bcd50fa8c3b27c6d1 /target/linux/generic/patches-3.14/120-bridge_allow_receiption_on_disabled_port.patch | |
| parent | 1f9f2714fde19244b196e7797371c902ea8eeb85 (diff) | |
| download | upstream-b0eae8648b2d266210940cfe9be4c29f194406b7.tar.gz upstream-b0eae8648b2d266210940cfe9be4c29f194406b7.tar.bz2 upstream-b0eae8648b2d266210940cfe9be4c29f194406b7.zip | |
kernel: update 3.14 to 3.14.9
Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41362 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.14/120-bridge_allow_receiption_on_disabled_port.patch')
| -rw-r--r-- | target/linux/generic/patches-3.14/120-bridge_allow_receiption_on_disabled_port.patch | 8 |
1 files changed, 4 insertions, 4 deletions
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 <nbd@openwrt.org> + 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 */ |