diff options
| author |   WANG Cong <xiyou.wangcong@gmail.com> | 2015-01-06 15:45:32 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-01-08 19:29:11 -0800 |
| commit | cd91cc5bdddf50f5c775fe5baeef7891b31d8741 (patch) | |
| tree | aa7f2a0bf101d08c3a22d6a9b7b9167b6d73d3a9 /Documentation/networking/timestamping/txtimestamp.c | |
| parent | ipv6: fix redefinition of in6_pktinfo and ip6_mtuinfo (diff) | |
| download | linux-dev-cd91cc5bdddf50f5c775fe5baeef7891b31d8741.tar.xz linux-dev-cd91cc5bdddf50f5c775fe5baeef7891b31d8741.zip | |
doc: fix the compile error of txtimestamp.c
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation/networking/timestamping/txtimestamp.c')
| -rw-r--r-- | Documentation/networking/timestamping/txtimestamp.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Documentation/networking/timestamping/txtimestamp.c b/Documentation/networking/timestamping/txtimestamp.c index 876f71c5625a..8778e684d482 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; |