diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-07-15 15:12:37 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-07-15 15:12:37 +0000 |
| commit | 139bd7c844499b56f69e5fa446e8f57c47236134 (patch) | |
| tree | 1f0b2ee44784321541ce0ba62cba083929127423 /target/linux/generic/patches-3.10/644-bridge_optimize_netfilter_hooks.patch | |
| parent | c369d9184c53e341a54eb082cd573edbcf6294dd (diff) | |
| download | master-187ad058-139bd7c844499b56f69e5fa446e8f57c47236134.tar.gz master-187ad058-139bd7c844499b56f69e5fa446e8f57c47236134.tar.bz2 master-187ad058-139bd7c844499b56f69e5fa446e8f57c47236134.zip | |
kernel: refresh 3.10 patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37348 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.10/644-bridge_optimize_netfilter_hooks.patch')
| -rw-r--r-- | target/linux/generic/patches-3.10/644-bridge_optimize_netfilter_hooks.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.10/644-bridge_optimize_netfilter_hooks.patch b/target/linux/generic/patches-3.10/644-bridge_optimize_netfilter_hooks.patch index 30c036b712..5b5dba5041 100644 --- a/target/linux/generic/patches-3.10/644-bridge_optimize_netfilter_hooks.patch +++ b/target/linux/generic/patches-3.10/644-bridge_optimize_netfilter_hooks.patch @@ -48,8 +48,8 @@ return RX_HANDLER_CONSUMED; /* consumed by filter */ } else { @@ -224,7 +224,7 @@ forward: - 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, + if (BR_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL, |