Skip to content
Snippets Groups Projects
Commit a6db996b authored by Felix Fietkau's avatar Felix Fietkau
Browse files

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


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

SVN-Revision: 37347
parent 55178554
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
target/linux/generic/patches-3.10/120-bridge_allow_receiption_on_disabled_port.patch
+ 2
− 2
View file @ a6db996b
...@@ -38,8 +38,8 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> ...@@ -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))
......
target/linux/generic/patches-3.9/120-bridge_allow_receiption_on_disabled_port.patch
+ 2
− 2
View file @ a6db996b
...@@ -38,8 +38,8 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> ...@@ -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))
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment