From: Sven Eckelmann Date: Sat, 12 Aug 2017 06:54:47 +0000 (+0200) Subject: batman-adv: Prevent FTBFS when redefining ether_setup X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=187937b35ab81d06aab6db71e150f5b47d21a362;p=feed%2Frouting.git batman-adv: Prevent FTBFS when redefining ether_setup batman-adv must make sure that ether_setup is already declared via linux/netdevice.h before the preprocessor can patch the use of it in batman-adv. Otherwise it is tried to also patch the declaration of ether_setup. Fixes: 8da2f5cbb128 ("batman-adv: upgrade package to latest release 2017.2") Signed-off-by: Sven Eckelmann --- diff --git a/batman-adv/files/compat-hacks.h b/batman-adv/files/compat-hacks.h index b8bcf72..4ae2bcc 100644 --- a/batman-adv/files/compat-hacks.h +++ b/batman-adv/files/compat-hacks.h @@ -228,6 +228,8 @@ static inline int batadv_nla_put_u64_64bit(struct sk_buff *skb, int attrtype, #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 9) +#include + /* work around missing attribute needs_free_netdev and priv_destructor in * net_device */