kernel: update bcma and ssb to master-2013-01-09 from wireless-testing

[oweals/openwrt.git] / target / linux / generic / patches-3.3 / 644-bridge_optimize_netfilter_hooks.patch

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 3b02c5cf94a4355254aca87dda18e01bb784ef8d..dafe4208179b6abba94e75f44d5e3a1d01913c52 100644 (file)
--- 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