aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-07-15 15:12:33 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-07-15 15:12:33 +0000
commita6db996b134ba48805bca692b904ef7805711e8c (patch)
treeb4403e00d644ee99b0d61733242a8bc917b8476a
parent55178554c24e9d88a5058bee2ff711d2f291ca53 (diff)
downloadupstream-a6db996b134ba48805bca692b904ef7805711e8c.tar.gz
upstream-a6db996b134ba48805bca692b904ef7805711e8c.tar.bz2
upstream-a6db996b134ba48805bca692b904ef7805711e8c.zip
kernel: fix another corner case in the bridge state patch (#13874)
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 37347
-rw-r--r--target/linux/generic/patches-3.10/120-bridge_allow_receiption_on_disabled_port.patch4
-rw-r--r--target/linux/generic/patches-3.9/120-bridge_allow_receiption_on_disabled_port.patch4
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.10/120-bridge_allow_receiption_on_disabled_port.patch b/target/linux/generic/patches-3.10/120-bridge_allow_receiption_on_disabled_port.patch
index 5d1661c1b7..f64db0fa3c 100644
--- a/target/linux/generic/patches-3.10/120-bridge_allow_receiption_on_disabled_port.patch
+++ b/target/linux/generic/patches-3.10/120-bridge_allow_receiption_on_disabled_port.patch
@@ -38,8 +38,8 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
forward:
switch (p->state) {
+ case BR_STATE_DISABLED:
-+ if (!ether_addr_equal(p->br->dev->dev_addr, dest))
-+ goto drop;
++ if (ether_addr_equal(p->br->dev->dev_addr, dest))
++ skb->pkt_type = PACKET_HOST;
+
+ if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
+ br_handle_local_finish))
diff --git a/target/linux/generic/patches-3.9/120-bridge_allow_receiption_on_disabled_port.patch b/target/linux/generic/patches-3.9/120-bridge_allow_receiption_on_disabled_port.patch
index 5d1661c1b7..f64db0fa3c 100644
--- a/target/linux/generic/patches-3.9/120-bridge_allow_receiption_on_disabled_port.patch
+++ b/target/linux/generic/patches-3.9/120-bridge_allow_receiption_on_disabled_port.patch
@@ -38,8 +38,8 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
forward:
switch (p->state) {
+ case BR_STATE_DISABLED:
-+ if (!ether_addr_equal(p->br->dev->dev_addr, dest))
-+ goto drop;
++ if (ether_addr_equal(p->br->dev->dev_addr, dest))
++ skb->pkt_type = PACKET_HOST;
+
+ if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
+ br_handle_local_finish))