lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 9 Dec 2014 21:41:22 -0800 From: Stephen Hemminger <stephen@...workplumber.org> To: David Miller <davem@...emloft.net> Cc: gregory.0xf0@...il.com, f.fainelli@...il.com, xiyou.wangcong@...il.com, netdev@...r.kernel.org Subject: [PATCH v2] if_bridge: fix conflict with glibc Even though kernel and glibc headers have same effective values Gcc complains about redefinitions. Since this is a header expected to be used by userspace, use glibc header. This supersedes change in commit 66f1c44887ba4f47d617f8ae21cf8e04e1892bd7 and fixes build of iproute2 with Glibc-2.19. This follows similar usage in include/uapi/linux for l2tp.h Signed-off-by: Stephen Hemminger <stephen@...workplumber.org> --- a/include/uapi/linux/if_bridge.h 2014-12-09 20:25:21.656016605 -0800 +++ b/include/uapi/linux/if_bridge.h 2014-12-09 21:32:01.391034756 -0800 @@ -15,7 +15,9 @@ #include <linux/types.h> #include <linux/if_ether.h> -#include <linux/in6.h> +#ifndef __KERNEL__ +#include <netinet/in.h> +#endif #define SYSFS_BRIDGE_ATTR "bridge" #define SYSFS_BRIDGE_FDB "brforward" -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists