From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752955AbdBNKlH (ORCPT ); Tue, 14 Feb 2017 05:41:07 -0500 Received: from vmicros1.altlinux.org ([194.107.17.57]:36040 "EHLO vmicros1.altlinux.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752694AbdBNKkW (ORCPT ); Tue, 14 Feb 2017 05:40:22 -0500 X-Greylist: delayed 386 seconds by postgrey-1.27 at vger.kernel.org; Tue, 14 Feb 2017 05:40:22 EST Date: Tue, 14 Feb 2017 13:33:53 +0300 From: "Dmitry V. Levin" To: James Chapman , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] uapi: fix linux/if_pppol2tp.h userspace compilation errors Message-ID: <20170214103353.GA8394@altlinux.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Move inclusion of before to fix 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 --- include/uapi/linux/if_pppol2tp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/uapi/linux/if_pppol2tp.h b/include/uapi/linux/if_pppol2tp.h index 6418c4d..54a404e 100644 --- a/include/uapi/linux/if_pppol2tp.h +++ b/include/uapi/linux/if_pppol2tp.h @@ -16,9 +16,9 @@ #define _UAPI__LINUX_IF_PPPOL2TP_H #include +#include #include #include -#include /* Structure used to connect() the socket to a particular tunnel UDP * socket over IPv4. -- ldv