diff options
Diffstat (limited to 'src/include/linux/xfrm.h')
| -rw-r--r-- | src/include/linux/xfrm.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/include/linux/xfrm.h b/src/include/linux/xfrm.h index b971e3848..92d9258df 100644 --- a/src/include/linux/xfrm.h +++ b/src/include/linux/xfrm.h @@ -283,6 +283,10 @@ enum xfrm_attr_type_t { XFRMA_KMADDRESS, /* struct xfrm_user_kmaddress */ XFRMA_ALG_AUTH_TRUNC, /* struct xfrm_algo_auth */ XFRMA_MARK, /* struct xfrm_mark */ +<<<<<<< HEAD +======= + XFRMA_TFCPAD, /* __u32 */ +>>>>>>> upstream/4.5.1 __XFRMA_MAX #define XFRMA_MAX (__XFRMA_MAX - 1) |