From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1757302AbdKOJyN (ORCPT <rfc822;w@1wt.eu>);
        Wed, 15 Nov 2017 04:54:13 -0500
Received: from mail.kapsi.fi ([91.232.154.25]:43537 "EHLO mail.kapsi.fi"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1752787AbdKOJyI (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 15 Nov 2017 04:54:08 -0500
Date: Wed, 15 Nov 2017 11:54:02 +0200
From: Mikko Rapeli <mikko.rapeli@iki.fi>
To: "Dmitry V. Levin" <ldv@altlinux.org>
Cc: "David S. Miller" <davem@davemloft.net>,
        Ilya Lesokhin <ilyal@mellanox.com>,
        Aviad Yehezkel <aviadye@mellanox.com>,
        Dave Watson <davejwatson@fb.com>, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH] uapi: fix linux/tls.h userspace compilation error
Message-ID: <20171115095402.GU13389@lakka.kapsi.fi>
References: <20171114033011.GA7503@altlinux.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20171114033011.GA7503@altlinux.org>
X-SA-Exim-Connect-IP: 2001:1bc8:1004::1
X-SA-Exim-Mail-From: mcfrisk@kapsi.fi
X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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