From: "Dmitry V. Levin" <ldv@altlinux.org>
To: James Chapman <jchapman@katalix.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] uapi: fix linux/if_pppol2tp.h userspace compilation errors
Date: Tue, 14 Feb 2017 13:33:53 +0300 [thread overview]
Message-ID: <20170214103353.GA8394@altlinux.org> (raw)
Move inclusion of <linux/l2tp.h> before <linux/in.h>
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 <ldv@altlinux.org>
---
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 <linux/types.h>
+#include <linux/l2tp.h>
#include <linux/in.h>
#include <linux/in6.h>
-#include <linux/l2tp.h>
/* Structure used to connect() the socket to a particular tunnel UDP
* socket over IPv4.
--
ldv
next reply other threads:[~2017-02-14 10:41 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-14 10:33 Dmitry V. Levin [this message]
2017-02-14 19:37 ` [PATCH] uapi: fix linux/if_pppol2tp.h userspace compilation errors David Miller
2017-02-14 20:29 ` Dmitry V. Levin
2017-02-15 2:23 ` [PATCH v2] " Dmitry V. Levin
2017-02-15 3:18 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170214103353.GA8394@altlinux.org \
--to=ldv@altlinux.org \
--cc=jchapman@katalix.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.