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

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

diff --git a/target/linux/generic/patches-3.8/644-bridge_optimize_netfilter_hooks.patch b/target/linux/generic/patches-3.8/644-bridge_optimize_netfilter_hooks.patch
index f03ceb65b04ee644871c60422c83b563847015c7..8eb8560a552a9115a1da04b16e8c07853a990dec 100644 (file)
--- a/target/linux/generic/patches-3.8/644-bridge_optimize_netfilter_hooks.patch
+++ b/target/linux/generic/patches-3.8/644-bridge_optimize_netfilter_hooks.patch
@@ -87,7 +87,7 @@
        if (vlan_tx_tag_present(skb))
 --- a/net/bridge/br_private.h
 +++ b/net/bridge/br_private.h
-@@ -531,15 +531,29 @@ static inline bool br_multicast_is_route
+@@ -537,15 +537,29 @@ static inline void br_mdb_uninit(void)
  
  /* br_netfilter.c */
  #ifdef CONFIG_BRIDGE_NETFILTER
@@ -119,7 +119,7 @@
  extern struct net_bridge_port *br_get_port(struct net_bridge *br,
 --- a/net/bridge/br_stp_bpdu.c
 +++ b/net/bridge/br_stp_bpdu.c
-@@ -52,7 +52,7 @@ static void br_send_bpdu(struct net_brid
+@@ -54,7 +54,7 @@ static void br_send_bpdu(struct net_brid
  
        skb_reset_mac_header(skb);