diff options
| author | Dmitry V. Levin <ldv@altlinux.org> | 2017-11-14 04:30:11 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-15 05:54:18 +0100 |
| commit | b9f3eb499d84f8d4adcb2f9212ec655700b28228 (patch) | |
| tree | d7f0bb4083bfd8d82e66d1a7e61957fceef1ab10 | |
| parent | usbnet: ipheth: prevent TX queue timeouts when device not ready (diff) | |
| download | linux-b9f3eb499d84f8d4adcb2f9212ec655700b28228.tar.xz linux-b9f3eb499d84f8d4adcb2f9212ec655700b28228.zip | |
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.h | 4 | ||||
| -rw-r--r-- | include/uapi/linux/tls.h | 4 |
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 @@ #define _TLS_OFFLOAD_H #include <linux/types.h> +#include <asm/byteorder.h> +#include <linux/socket.h> +#include <linux/tcp.h> +#include <net/tcp.h> #include <uapi/linux/tls.h> 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 @@ #define _UAPI_LINUX_TLS_H #include <linux/types.h> -#include <asm/byteorder.h> -#include <linux/socket.h> -#include <linux/tcp.h> -#include <net/tcp.h> /* TLS socket options */ #define TLS_TX 1 /* Set transmit parameters */ |