From: Stephen Hemminger <stephen@networkplumber.org>
To: David Miller <davem@davemloft.net>
Cc: gregory.0xf0@gmail.com, f.fainelli@gmail.com,
xiyou.wangcong@gmail.com, netdev@vger.kernel.org
Subject: [PATCH v2] if_bridge: fix conflict with glibc
Date: Tue, 9 Dec 2014 21:41:22 -0800 [thread overview]
Message-ID: <20141209214122.76b15851@urahara> (raw)
In-Reply-To: <20141209.234954.1634249639621060084.davem@davemloft.net>
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@networkplumber.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"
next prev parent reply other threads:[~2014-12-10 5:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-10 4:30 PATCH] Revert "bridge: include in6.h in if_bridge.h for struct in6_addr" Stephen Hemminger
2014-12-10 4:49 ` David Miller
2014-12-10 5:41 ` Stephen Hemminger [this message]
2014-12-10 18:34 ` [PATCH v2] if_bridge: fix conflict with glibc David Miller
2014-12-10 23:57 ` Stephen Hemminger
2014-12-11 1:44 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141209214122.76b15851@urahara \
--to=stephen@networkplumber.org \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=gregory.0xf0@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=xiyou.wangcong@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox