hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

kernel: fix another corner case in the bridge state patch (#13874) 

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37347 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Felix Fietkau 2013-07-15 15:12:33 +00:00
parent addf81e48e
commit c369d9184c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/generic/patches-3.10/120-bridge_allow_receiption_on_disabled_port.patch
View File

@ -38,8 +38,8 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
forward: forward:
switch (p->state) { switch (p->state) {
+ case BR_STATE_DISABLED: + case BR_STATE_DISABLED:
+ if (!ether_addr_equal(p->br->dev->dev_addr, dest)) + if (ether_addr_equal(p->br->dev->dev_addr, dest))
+ goto drop; + skb->pkt_type = PACKET_HOST;
+ +
+ if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL, + if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
+ br_handle_local_finish)) + br_handle_local_finish))

4
target/linux/generic/patches-3.9/120-bridge_allow_receiption_on_disabled_port.patch
View File

@ -38,8 +38,8 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
forward: forward:
switch (p->state) { switch (p->state) {
+ case BR_STATE_DISABLED: + case BR_STATE_DISABLED:
+ if (!ether_addr_equal(p->br->dev->dev_addr, dest)) + if (ether_addr_equal(p->br->dev->dev_addr, dest))
+ goto drop; + skb->pkt_type = PACKET_HOST;
+ +
+ if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL, + if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
+ br_handle_local_finish)) + br_handle_local_finish))