diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2012-04-30 08:38:11 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2012-04-30 08:38:11 +0000 |
commit | 465b2a024cada2dbb5bf300c40c5ce408c67f46e (patch) | |
tree | 0f3fe5ec1b90254147bbcdf323958e058fcd918f /target/linux/generic/patches-3.3/644-bridge_optimize_netfilter_hooks.patch | |
parent | db5b2b03af4e19b7adcebc60834bce5d5e45487e (diff) | |
download | upstream-465b2a024cada2dbb5bf300c40c5ce408c67f46e.tar.gz upstream-465b2a024cada2dbb5bf300c40c5ce408c67f46e.tar.bz2 upstream-465b2a024cada2dbb5bf300c40c5ce408c67f46e.zip |
kernel: update linux 3.3 to 3.3.4
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31541 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.3/644-bridge_optimize_netfilter_hooks.patch')
-rw-r--r-- | target/linux/generic/patches-3.3/644-bridge_optimize_netfilter_hooks.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.3/644-bridge_optimize_netfilter_hooks.patch b/target/linux/generic/patches-3.3/644-bridge_optimize_netfilter_hooks.patch index 3b02c5cf94..dafe420817 100644 --- a/target/linux/generic/patches-3.3/644-bridge_optimize_netfilter_hooks.patch +++ b/target/linux/generic/patches-3.3/644-bridge_optimize_netfilter_hooks.patch @@ -58,7 +58,7 @@ default: --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c -@@ -827,7 +827,7 @@ static void __br_multicast_send_query(st +@@ -753,7 +753,7 @@ static void __br_multicast_send_query(st if (port) { __skb_push(skb, sizeof(struct ethhdr)); skb->dev = port->dev; @@ -87,7 +87,7 @@ if (vlan_tx_tag_present(skb)) --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h -@@ -490,15 +490,29 @@ static inline bool br_multicast_is_route +@@ -486,15 +486,29 @@ static inline bool br_multicast_is_route /* br_netfilter.c */ #ifdef CONFIG_BRIDGE_NETFILTER |