Re: [PATCH v2] uapi: fix linux/if_pppol2tp.h userspace compilation errors

Path	csiph.com!news.redatomik.org!aioe.org!bofh.it!news.nic.it!robomod
From	David Miller <davem@davemloft.net>
Newsgroups	linux.kernel
Subject	Re: [PATCH v2] uapi: fix linux/if_pppol2tp.h userspace compilation errors
Date	Wed, 15 Feb 2017 04:20:01 +0100
Message-ID	<taYil-2gd-3@gated-at.bofh.it> (permalink)
References	<taR7c-5Vy-27@gated-at.bofh.it> <taS3h-6vH-39@gated-at.bofh.it> <taXvX-1Eg-5@gated-at.bofh.it>
X-Mailer	Mew version 6.7 on Emacs 25.1 / Mule 6.0 (HANACHIRUSATO)
MIME-Version	1.0
Content-Type	Text/Plain; charset=us-ascii
Content-Transfer-Encoding	7bit
X-Greylist	Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.5.12 (shards.monkeyblade.net [149.20.54.216]); Tue, 14 Feb 2017 18:19:39 -0800 (PST)
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	25
Organization	linux.* mail to news gateway
X-Original-Cc	asbjorn@asbjorn.st, jchapman@katalix.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org
X-Original-Date	Tue, 14 Feb 2017 22:18:27 -0500 (EST)
X-Original-Message-ID	<20170214.221827.1737017127401316605.davem@davemloft.net>
X-Original-References	<20170214.143723.629330014459224649.davem@davemloft.net> <20170214202950.GB17325@altlinux.org> <20170215022326.GA21493@altlinux.org>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1581028

Show key headers only | View raw

From: "Dmitry V. Levin" <ldv@altlinux.org>
Date: Wed, 15 Feb 2017 05:23:26 +0300

> Because of <linux/libc-compat.h> interface limitations, <netinet/in.h>
> provided by libc cannot be included after <linux/in.h>, therefore any
> header that includes <netinet/in.h> cannot be included after <linux/in.h>.
> 
> Change uapi/linux/l2tp.h, the last uapi header that includes
> <netinet/in.h>, to include <linux/in.h> and <linux/in6.h> instead of
> <netinet/in.h> and use __SOCK_SIZE__ instead of sizeof(struct sockaddr)
> the same way as uapi/linux/in.h does, to fix linux/if_pppol2tp.h userspace
> compilation errors like this:
> 
> In file included from /usr/include/linux/l2tp.h:12:0,
>                  from /usr/include/linux/if_pppol2tp.h:21,
> /usr/include/netinet/in.h:31:8: error: redefinition of 'struct in_addr'
> 
> Fixes: 47c3e7783be4 ("net: l2tp: deprecate PPPOL2TP_MSG_* in favour of L2TP_MSG_*")
> Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
> ---
> v2: change uapi/linux/l2tp.h to fix <linux/if_pppol2tp.h>

This looks a lot better.

Applied and queued up for -stable, thanks.

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH] uapi: fix linux/if_pppol2tp.h userspace compilation errors "Dmitry V. Levin" <ldv@altlinux.org> - 2017-02-14 11:50 +0100
  Re: [PATCH] uapi: fix linux/if_pppol2tp.h userspace compilation  errors David Miller <davem@davemloft.net> - 2017-02-14 20:40 +0100
    Re: [PATCH] uapi: fix linux/if_pppol2tp.h userspace compilation errors "Dmitry V. Levin" <ldv@altlinux.org> - 2017-02-14 21:40 +0100
      [PATCH v2] uapi: fix linux/if_pppol2tp.h userspace compilation errors "Dmitry V. Levin" <ldv@altlinux.org> - 2017-02-15 03:30 +0100
        Re: [PATCH v2] uapi: fix linux/if_pppol2tp.h userspace compilation  errors David Miller <davem@davemloft.net> - 2017-02-15 04:20 +0100

csiph-web