Repository : ssh://git@open-mesh.org/batctl

On branches: ecsv/test,master

commit e6ae9965ccd774a4e914b8b8c9ba72df1187fbd5 Author: Sven Eckelmann sven@narfation.org Date: Sat Feb 11 22:07:38 2017 +0100

batctl: Work around musl conflicts with linux/ethtool.h

linux/ethtool.h and musl's net/ethernet.h cannot be used at the same time. Otherwise the compiles failes with

In file included from include/net/ethernet.h:10:0, from functions.h:25, from ioctl.c:36: include/netinet/if_ether.h:101:8: error: redefinition of 'struct ethhdr' struct ethhdr { ^ In file included from include/linux/ethtool.h:17:0, from ioctl.c:33: include/linux/if_ether.h:140:8: note: originally defined here struct ethhdr { ^ Makefile:123: recipe for target 'ioctl.o' failed

Fixes: 894b25c2be5f ("batctl: Make root privileges check function specific") Signed-off-by: Sven Eckelmann sven@narfation.org

e6ae9965ccd774a4e914b8b8c9ba72df1187fbd5 ioctl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ioctl.c b/ioctl.c index 832a274..5fc56b8 100644 --- a/ioctl.c +++ b/ioctl.c @@ -33,9 +33,10 @@ #include <linux/ethtool.h> #include <stdint.h>

-#include "functions.h" #include "ioctl.h"

+void check_root_or_die(const char *cmd); + /* code borrowed from ethtool */ static int statistics_custom_get(int fd, struct ifreq *ifr) {