aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-07-22 15:30:56 +0000
committerGabor Juhos <juhosg@openwrt.org>2013-07-22 15:30:56 +0000
commitfcc7d8f722c8803f1d7555fc27638c72ad6a561a (patch)
tree60aae6b71dd803449aa6112e3ec514b67d7845c8 /target/linux/generic
parent60cc4c5c00c31ae15a8cc2677b846e5ad1fcc58b (diff)
downloadupstream-fcc7d8f722c8803f1d7555fc27638c72ad6a561a.tar.gz
upstream-fcc7d8f722c8803f1d7555fc27638c72ad6a561a.tar.bz2
upstream-fcc7d8f722c8803f1d7555fc27638c72ad6a561a.zip
kernel: update 3.9 to 3.9.11
Also refresh 3.9 patches. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37501 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-3.9/644-bridge_optimize_netfilter_hooks.patch4
1 files changed, 2 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 986b3f843b..64a980ebdd 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
@@ -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,