aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-02-08 15:36:03 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2014-02-08 15:36:03 +0000
commit7790ac5ecc2e468e525362aff10e66775beb68e4 (patch)
treedabe457ea46f5ed61ff95d98a0ca8131f9909005 /target/linux/generic
parent8f0ffe9cc640e7df48af6a0394e6d6f7d8118ea7 (diff)
downloadupstream-7790ac5ecc2e468e525362aff10e66775beb68e4.tar.gz
upstream-7790ac5ecc2e468e525362aff10e66775beb68e4.tar.bz2
upstream-7790ac5ecc2e468e525362aff10e66775beb68e4.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> SVN-Revision: 39533
Diffstat (limited to 'target/linux/generic')
-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 *);