| Message ID | 1420587932-8733-2-git-send-email-xiyou.wangcong@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Cong Wang <xiyou.wangcong@gmail.com> Date: Tue, 6 Jan 2015 15:45:32 -0800 > 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> Applied.
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;
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(-)