From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sat, 8 Feb 2014 15:36:03 +0000 (+0000)
Subject: kernel: fix bridge compilation on kernel 3.13
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7790ac5ecc2e468e525362aff10e66775beb68e4;p=openwrt%2Fstaging%2Flinusw.git

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
---

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 *);