History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

No conflicts.

Jakub Kicinski committed 5 years ago

Commit 9fe11552 parents c514fbb 1da3854265 files · +2787 −1902Browse files

Showing the changes to include/uapi (2 of 265 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/hyperv.h +1 −1
  2. include/uapi/linux/xfrm.h +9 −6
include/uapi/linux/hyperv.h+1−1
@@ -26,7 +26,7 @@ · 25 unmodified lines
26#ifndef _UAPI_HYPERV_H26#ifndef _UAPI_HYPERV_H
27#define _UAPI_HYPERV_H27#define _UAPI_HYPERV_H
28 28
29#include <linux/uuid.h>29#include <linux/types.h>
30 30
31/*31/*
32 * Framework version for util services.32 * Framework version for util services.
include/uapi/linux/xfrm.h+9−6
@@ -213,13 +213,13 @@ enum { · 212 unmodified lines
213 XFRM_MSG_GETSPDINFO,213 XFRM_MSG_GETSPDINFO,
214#define XFRM_MSG_GETSPDINFO XFRM_MSG_GETSPDINFO214#define XFRM_MSG_GETSPDINFO XFRM_MSG_GETSPDINFO
215 215
216 XFRM_MSG_MAPPING,
217#define XFRM_MSG_MAPPING XFRM_MSG_MAPPING
218
216 XFRM_MSG_SETDEFAULT,219 XFRM_MSG_SETDEFAULT,
217#define XFRM_MSG_SETDEFAULT XFRM_MSG_SETDEFAULT220#define XFRM_MSG_SETDEFAULT XFRM_MSG_SETDEFAULT
218 XFRM_MSG_GETDEFAULT,221 XFRM_MSG_GETDEFAULT,
219#define XFRM_MSG_GETDEFAULT XFRM_MSG_GETDEFAULT222#define XFRM_MSG_GETDEFAULT XFRM_MSG_GETDEFAULT
220
221 XFRM_MSG_MAPPING,
222#define XFRM_MSG_MAPPING XFRM_MSG_MAPPING
223 __XFRM_MSG_MAX223 __XFRM_MSG_MAX
224};224};
225#define XFRM_MSG_MAX (__XFRM_MSG_MAX - 1)225#define XFRM_MSG_MAX (__XFRM_MSG_MAX - 1)
@@ -514,9 +514,12 @@ struct xfrm_user_offload { · 288 unmodified lines
514#define XFRM_OFFLOAD_INBOUND 2514#define XFRM_OFFLOAD_INBOUND 2
515 515
516struct xfrm_userpolicy_default {516struct xfrm_userpolicy_default {
517#define XFRM_USERPOLICY_DIRMASK_MAX (sizeof(__u8) * 8)517#define XFRM_USERPOLICY_UNSPEC 0
518 __u8 dirmask;518#define XFRM_USERPOLICY_BLOCK 1
519 __u8 action;519#define XFRM_USERPOLICY_ACCEPT 2
520 __u8 in;
521 __u8 fwd;
522 __u8 out;
520};523};
521 524
522#ifndef __KERNEL__525#ifndef __KERNEL__