1 From 1e1e8d74db98faed57a5a62788e1226801661e0e Mon Sep 17 00:00:00 2001
2 From: Ting Liu <ting.liu@freescale.com>
3 Date: Tue, 22 Dec 2015 23:37:49 +0800
4 Subject: [PATCH] xfrm_km.c: use in6_* macros from glibc instead of kernel
6 Both glibc and the kernel have in6_* macros definition. Use the one from glibc.
7 Kernel headers will check for previous libc definitions by including
8 include/linux/libc-compat.h.
10 Fix the below build error:
11 | [CC] xfrm_km.c (bin:srio_ipsec_offload)
12 | In file included from .../tmp/sysroots/b4860qds-64b/usr/include/linux/xfrm.h:4:0,
13 | from src/srio_ipsec_offload/xfrm_km.c:46:
14 | .../usr/include/netinet/in.h:99:5: error: expected identifier before numeric constant
15 | IPPROTO_HOPOPTS = 0, /* IPv6 Hop-by-Hop options. */
17 | In file included from .../tmp/sysroots/b4860qds-64b/usr/include/netinet/ip.h:24:0,
18 | from src/srio_ipsec_offload/xfrm_km.c:52:
19 | .../tmp/sysroots/b4860qds-64b/usr/include/netinet/in.h:209:8: error: redefinition of 'struct in6_addr'
22 | In file included from .../tmp/sysroots/b4860qds-64b/usr/include/linux/xfrm.h:4:0,
23 | from src/srio_ipsec_offload/xfrm_km.c:46:
24 | .../tmp/sysroots/b4860qds-64b/usr/include/linux/in6.h:32:8: note: originally defined here
28 Upstream-Status: Pending
30 Signed-off-by: Ting Liu <ting.liu@freescale.com>
32 src/srio_ipsec_offload/xfrm_km.c | 1 +
33 1 file changed, 1 insertion(+)
35 diff --git a/src/srio_ipsec_offload/xfrm_km.c b/src/srio_ipsec_offload/xfrm_km.c
36 index df23fd1..d69aafa 100644
37 --- a/src/srio_ipsec_offload/xfrm_km.c
38 +++ b/src/srio_ipsec_offload/xfrm_km.c
40 #include <linux/types.h>
41 #include <sys/socket.h>
42 #include <sys/ioctl.h>
43 +#include <netinet/in.h>
44 #include <linux/netlink.h>
45 #include <linux/xfrm.h>
