aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry V. Levin <ldv@altlinux.org>2017-11-13 22:30:11 -0500
committerDavid S. Miller <davem@davemloft.net>2017-11-14 23:54:18 -0500
commitb9f3eb499d84f8d4adcb2f9212ec655700b28228 (patch)
treed7f0bb4083bfd8d82e66d1a7e61957fceef1ab10
parentbb1b40c7cb863f0800a6410c7dcb86cf3f28d3b1 (diff)
uapi: fix linux/tls.h userspace compilation error
Move inclusion of a private kernel header <net/tcp.h> from uapi/linux/tls.h to its only user - net/tls.h, to fix the following linux/tls.h userspace compilation error: /usr/include/linux/tls.h:41:21: fatal error: net/tcp.h: No such file or directory As to this point uapi/linux/tls.h was totaly unusuable for userspace, cleanup this header file further by moving other redundant includes to net/tls.h. Fixes: 3c4d7559159b ("tls: kernel TLS support") Cc: <stable@vger.kernel.org> # v4.13+ Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/tls.h4
-rw-r--r--include/uapi/linux/tls.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/include/net/tls.h b/include/net/tls.h
index 70becd0a9299..936cfc5cab7d 100644
--- a/include/net/tls.h
+++ b/include/net/tls.h
@@ -35,6 +35,10 @@
35#define _TLS_OFFLOAD_H 35#define _TLS_OFFLOAD_H
36 36
37#include <linux/types.h> 37#include <linux/types.h>
38#include <asm/byteorder.h>
39#include <linux/socket.h>
40#include <linux/tcp.h>
41#include <net/tcp.h>
38 42
39#include <uapi/linux/tls.h> 43#include <uapi/linux/tls.h>
40 44
diff --git a/include/uapi/linux/tls.h b/include/uapi/linux/tls.h
index d5e0682ab837..293b2cdad88d 100644
--- a/include/uapi/linux/tls.h
+++ b/include/uapi/linux/tls.h
@@ -35,10 +35,6 @@
35#define _UAPI_LINUX_TLS_H 35#define _UAPI_LINUX_TLS_H
36 36
37#include <linux/types.h> 37#include <linux/types.h>
38#include <asm/byteorder.h>
39#include <linux/socket.h>
40#include <linux/tcp.h>
41#include <net/tcp.h>
42 38
43/* TLS socket options */ 39/* TLS socket options */
44#define TLS_TX 1 /* Set transmit parameters */ 40#define TLS_TX 1 /* Set transmit parameters */