[generic]: upgrade 3.12 to 3.12.10

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

diff --git a/target/linux/generic/patches-3.12/644-bridge_optimize_netfilter_hooks.patch b/target/linux/generic/patches-3.12/644-bridge_optimize_netfilter_hooks.patch
index 85def08..578eed2 100644 (file)
--- a/target/linux/generic/patches-3.12/644-bridge_optimize_netfilter_hooks.patch
+++ b/target/linux/generic/patches-3.12/644-bridge_optimize_netfilter_hooks.patch
@@ -96,7 +96,7 @@
        if (vlan_tx_tag_present(skb))
 --- a/net/bridge/br_private.h
 +++ b/net/bridge/br_private.h
-@@ -725,15 +725,29 @@ static inline u16 br_get_pvid(const stru
+@@ -735,15 +735,29 @@ static inline u16 br_get_pvid(const stru
  
  /* br_netfilter.c */
  #ifdef CONFIG_BRIDGE_NETFILTER