aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2014-02-08 15:36:03 +0000
committerHauke Mehrtens <hauke@openwrt.org>2014-02-08 15:36:03 +0000
commit0fa466cec79dbd64ef7eae95894568fed93ecea5 (patch)
tree8164b28d028bf7b2d790d390ecca870ebe5ea98c /target
parentddab530dd3ea0fe72a8bb6f1934a5ae661510c77 (diff)
downloadupstream-0fa466cec79dbd64ef7eae95894568fed93ecea5.tar.gz
upstream-0fa466cec79dbd64ef7eae95894568fed93ecea5.tar.bz2
upstream-0fa466cec79dbd64ef7eae95894568fed93ecea5.zip
kernel: fix bridge compilation on kernel 3.13
The int brnf_call_ebtables in the header should be extern, otherwise every object file gets its own int and they will conflict when linking the binary. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39533 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic/patches-3.13/644-bridge_optimize_netfilter_hooks.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/patches-3.13/644-bridge_optimize_netfilter_hooks.patch b/target/linux/generic/patches-3.13/644-bridge_optimize_netfilter_hooks.patch
index 23eb2859f1..3d5ea84ab0 100644
--- a/target/linux/generic/patches-3.13/644-bridge_optimize_netfilter_hooks.patch
+++ b/target/linux/generic/patches-3.13/644-bridge_optimize_netfilter_hooks.patch
@@ -100,7 +100,7 @@
/* br_netfilter.c */
#ifdef CONFIG_BRIDGE_NETFILTER
-+int brnf_call_ebtables;
++extern int brnf_call_ebtables;
int br_netfilter_init(void);
void br_netfilter_fini(void);
void br_netfilter_rtable_init(struct net_bridge *);