diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2014-02-13 12:57:36 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2014-02-13 12:57:36 +0000 |
| commit | 87573f9583f900bc82fe435ebbcff8dd72c88205 (patch) | |
| tree | 2f9a80173d0873fc7198b0ed4138f4d734555c97 /target/linux/generic/patches-3.12/644-bridge_optimize_netfilter_hooks.patch | |
| parent | 23122cc26eed5dca0dde4814551da2c9395979c4 (diff) | |
| download | upstream-87573f9583f900bc82fe435ebbcff8dd72c88205.tar.gz upstream-87573f9583f900bc82fe435ebbcff8dd72c88205.tar.bz2 upstream-87573f9583f900bc82fe435ebbcff8dd72c88205.zip | |
[generic]: upgrade 3.12 to 3.12.10
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39581 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.12/644-bridge_optimize_netfilter_hooks.patch')
| -rw-r--r-- | target/linux/generic/patches-3.12/644-bridge_optimize_netfilter_hooks.patch | 2 |
1 files changed, 1 insertions, 1 deletions
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 85def08702..578eed22cd 100644 --- 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 |