Message ID | 20171114033011.GA7503@altlinux.org |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
Series | uapi: fix linux/tls.h userspace compilation error | expand |
On Tue, Nov 14, 2017 at 06:30:11AM +0300, Dmitry V. Levin wrote: > 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> Acked-by: Mikko Rapeli <mikko.rapeli@iki.fi> > --- > include/net/tls.h | 4 ++++ > 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 b89d397dd62f..c06db1eadac2 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 */ > > -- > ldv
diff --git a/include/net/tls.h b/include/net/tls.h index b89d397dd62f..c06db1eadac2 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 */
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> --- include/net/tls.h | 4 ++++ include/uapi/linux/tls.h | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-)