diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-06-25 13:13:14 (GMT) |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-06-25 13:13:19 (GMT) |
| commit | 2eb0eebc417f4ddeb4781206e44465529b235e52 (patch) | |
| tree | 05c48ca1f2cb6f57ab6646e93a110ddb6d934fc4 | |
| parent | bb504393c4d67d92689b509f11be95cc5d9ad63a (diff) | |
| download | libnl-2eb0eebc417f4ddeb4781206e44465529b235e52.zip libnl-2eb0eebc417f4ddeb4781206e44465529b235e52.tar.gz libnl-2eb0eebc417f4ddeb4781206e44465529b235e52.tar.bz2 | |
include/linux: update copy of kernel headers
Taken from upstream kernel commit 29dcea88779c856c7dc92040a0c01233263101d4
(v4.17).
| -rw-r--r-- | include/linux-private/linux/if_tunnel.h | 43 |
1 files changed, 38 insertions, 5 deletions
diff --git a/include/linux-private/linux/if_tunnel.h b/include/linux-private/linux/if_tunnel.h index 3746e82..ecdc766 100644 --- a/include/linux-private/linux/if_tunnel.h +++ b/include/linux-private/linux/if_tunnel.h @@ -1,7 +1,11 @@ -#ifndef _UAPI_IF_TUNNEL_H_ -#define _UAPI_IF_TUNNEL_H_ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +#ifndef _IF_TUNNEL_H_ +#define _IF_TUNNEL_H_ #include <linux/types.h> +#include <linux/if.h> +#include <linux/ip.h> +#include <linux/in6.h> #include <asm/byteorder.h> @@ -24,9 +28,23 @@ #define GRE_SEQ __cpu_to_be16(0x1000) #define GRE_STRICT __cpu_to_be16(0x0800) #define GRE_REC __cpu_to_be16(0x0700) -#define GRE_FLAGS __cpu_to_be16(0x00F8) +#define GRE_ACK __cpu_to_be16(0x0080) +#define GRE_FLAGS __cpu_to_be16(0x0078) #define GRE_VERSION __cpu_to_be16(0x0007) +#define GRE_IS_CSUM(f) ((f) & GRE_CSUM) +#define GRE_IS_ROUTING(f) ((f) & GRE_ROUTING) +#define GRE_IS_KEY(f) ((f) & GRE_KEY) +#define GRE_IS_SEQ(f) ((f) & GRE_SEQ) +#define GRE_IS_STRICT(f) ((f) & GRE_STRICT) +#define GRE_IS_REC(f) ((f) & GRE_REC) +#define GRE_IS_ACK(f) ((f) & GRE_ACK) + +#define GRE_VERSION_0 __cpu_to_be16(0x0000) +#define GRE_VERSION_1 __cpu_to_be16(0x0001) +#define GRE_PROTO_PPP __cpu_to_be16(0x880b) +#define GRE_PPTP_KEY_MASK __cpu_to_be32(0xffff) + struct ip_tunnel_parm { char name[IFNAMSIZ]; int link; @@ -63,6 +81,17 @@ enum { }; #define IFLA_IPTUN_MAX (__IFLA_IPTUN_MAX - 1) +enum tunnel_encap_types { + TUNNEL_ENCAP_NONE, + TUNNEL_ENCAP_FOU, + TUNNEL_ENCAP_GUE, + TUNNEL_ENCAP_MPLS, +}; + +#define TUNNEL_ENCAP_FLAG_CSUM (1<<0) +#define TUNNEL_ENCAP_FLAG_CSUM6 (1<<1) +#define TUNNEL_ENCAP_FLAG_REMCSUM (1<<2) + /* SIT-mode i_flags */ #define SIT_ISATAP 0x0001 @@ -107,13 +136,17 @@ enum { IFLA_GRE_COLLECT_METADATA, IFLA_GRE_IGNORE_DF, IFLA_GRE_FWMARK, + IFLA_GRE_ERSPAN_INDEX, + IFLA_GRE_ERSPAN_VER, + IFLA_GRE_ERSPAN_DIR, + IFLA_GRE_ERSPAN_HWID, __IFLA_GRE_MAX, }; #define IFLA_GRE_MAX (__IFLA_GRE_MAX - 1) /* VTI-mode i_flags */ -#define VTI_ISVTI 0x0001 +#define VTI_ISVTI ((__be16)0x0001) enum { IFLA_VTI_UNSPEC, @@ -127,4 +160,4 @@ enum { }; #define IFLA_VTI_MAX (__IFLA_VTI_MAX - 1) -#endif /* _UAPI_IF_TUNNEL_H_ */ +#endif /* _IF_TUNNEL_H_ */ |