diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-07-15 12:25:58 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-07-15 12:25:58 +0000 |
| commit | 93cb862260ffc77ce73630ae26b952e9d44efcc2 (patch) | |
| tree | 554f47e7f0f8ca8b8012c67a16831962781aed7f /target/linux/generic/patches-3.9/644-bridge_optimize_netfilter_hooks.patch | |
| parent | 866e229299e5b9a00c08a07b294760ac381d7fa8 (diff) | |
| download | upstream-93cb862260ffc77ce73630ae26b952e9d44efcc2.tar.gz upstream-93cb862260ffc77ce73630ae26b952e9d44efcc2.tar.bz2 upstream-93cb862260ffc77ce73630ae26b952e9d44efcc2.zip | |
kernel: fix a bridge issue that broke WDS client handling in 3.9+
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 37341
Diffstat (limited to 'target/linux/generic/patches-3.9/644-bridge_optimize_netfilter_hooks.patch')
| -rw-r--r-- | target/linux/generic/patches-3.9/644-bridge_optimize_netfilter_hooks.patch | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.9/644-bridge_optimize_netfilter_hooks.patch b/target/linux/generic/patches-3.9/644-bridge_optimize_netfilter_hooks.patch index 8204bba51b..986b3f843b 100644 --- a/target/linux/generic/patches-3.9/644-bridge_optimize_netfilter_hooks.patch +++ b/target/linux/generic/patches-3.9/644-bridge_optimize_netfilter_hooks.patch @@ -38,7 +38,7 @@ netif_receive_skb); } -@@ -205,7 +205,7 @@ rx_handler_result_t br_handle_frame(stru +@@ -209,7 +209,7 @@ rx_handler_result_t br_handle_frame(stru } /* Deliver packet to local host only */ @@ -47,7 +47,16 @@ NULL, br_handle_local_finish)) { return RX_HANDLER_CONSUMED; /* consumed by filter */ } else { -@@ -230,7 +230,7 @@ forward: +@@ -224,7 +224,7 @@ forward: + if (!ether_addr_equal(p->br->dev->dev_addr, dest)) + goto drop; + +- 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, + br_handle_local_finish)) + break; + +@@ -246,7 +246,7 @@ forward: if (ether_addr_equal(p->br->dev->dev_addr, dest)) skb->pkt_type = PACKET_HOST; |