From: Cong Wang <xiyou.wangcong@gmail.com>
To: netdev@vger.kernel.org
Cc: carlos@redhat.com, vlee@twopensource.com, davem@davemloft.net,
Cong Wang <xiyou.wangcong@gmail.com>
Subject: [Patch net-next] doc: fix the compile error of txtimestamp.c
Date: Tue, 6 Jan 2015 15:45:32 -0800 [thread overview]
Message-ID: <1420587932-8733-2-git-send-email-xiyou.wangcong@gmail.com> (raw)
In-Reply-To: <1420587932-8733-1-git-send-email-xiyou.wangcong@gmail.com>
Vinson reported:
HOSTCC Documentation/networking/timestamping/txtimestamp
Documentation/networking/timestamping/txtimestamp.c:64:8: error:
redefinition of ‘struct in6_pktinfo’
struct in6_pktinfo {
^
In file included from /usr/include/arpa/inet.h:23:0,
from Documentation/networking/timestamping/txtimestamp.c:33:
/usr/include/netinet/in.h:456:8: note: originally defined here
struct in6_pktinfo
^
After we sync with libc header, we don't need this ugly hack any more.
Reported-by: Vinson Lee <vlee@twopensource.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
---
Documentation/networking/timestamping/txtimestamp.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/Documentation/networking/timestamping/txtimestamp.c b/Documentation/networking/timestamping/txtimestamp.c
index 876f71c..8778e68 100644
--- a/Documentation/networking/timestamping/txtimestamp.c
+++ b/Documentation/networking/timestamping/txtimestamp.c
@@ -59,14 +59,6 @@
#include <time.h>
#include <unistd.h>
-/* ugly hack to work around netinet/in.h and linux/ipv6.h conflicts */
-#ifndef in6_pktinfo
-struct in6_pktinfo {
- struct in6_addr ipi6_addr;
- int ipi6_ifindex;
-};
-#endif
-
/* command line parameters */
static int cfg_proto = SOCK_STREAM;
static int cfg_ipproto = IPPROTO_TCP;
--
1.8.3.1
next prev parent reply other threads:[~2015-01-06 23:45 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-06 23:45 [Patch net-next] ipv6: fix redefinition of in6_pktinfo and ip6_mtuinfo Cong Wang
2015-01-06 23:45 ` Cong Wang [this message]
2015-01-09 3:38 ` [Patch net-next] doc: fix the compile error of txtimestamp.c David Miller
2015-01-09 3:38 ` [Patch net-next] ipv6: fix redefinition of in6_pktinfo and ip6_mtuinfo David Miller
2015-01-09 16:27 ` Carlos O'Donell
2015-02-06 5:29 ` Carlos O'Donell
2015-02-07 6:39 ` Cong Wang
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=1420587932-8733-2-git-send-email-xiyou.wangcong@gmail.com \
--to=xiyou.wangcong@gmail.com \
--cc=carlos@redhat.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=vlee@twopensource.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;
as well as URLs for NNTP newsgroup(s).