[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20191222060227.7089-1-AWilcox@Wilcox-Tech.com>
Date: Sun, 22 Dec 2019 00:02:27 -0600
From: "A. Wilcox" <AWilcox@...cox-Tech.com>
To: netdev@...r.kernel.org,
linux-api@...r.kernel.org,
musl@...ts.openwall.com
Cc: "A. Wilcox" <AWilcox@...cox-Tech.com>
Subject: [PATCH] uapi: Prevent redefinition of struct iphdr
As with struct ethhdr, the musl libc provides its own definition of the
iphdr struct. This guard ensures software like net-tools builds correctly
on the musl libc.
The __UAPI_DEF_IPHDR definition is in ip.h itself to prevent the issue in
commit da360299b673 ("uapi/if_ether.h: move __UAPI_DEF_ETHHDR libc define")
from being seen here.
Signed-off-by: A. Wilcox <AWilcox@...cox-Tech.com>
---
include/uapi/linux/ip.h | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/include/uapi/linux/ip.h b/include/uapi/linux/ip.h
index e42d13b55cf3..d34a0d295672 100644
--- a/include/uapi/linux/ip.h
+++ b/include/uapi/linux/ip.h
@@ -83,6 +83,13 @@
#define IPV4_BEET_PHMAXLEN 8
+/* Allow libcs to deactivate this - musl has its own copy in <netinet/ip.h> */
+
+#ifndef __UAPI_DEF_IPHDR
+#define __UAPI_DEF_IPHDR 1
+#endif
+
+#if __UAPI_DEF_IPHDR
struct iphdr {
#if defined(__LITTLE_ENDIAN_BITFIELD)
__u8 ihl:4,
@@ -104,6 +111,7 @@ struct iphdr {
__be32 daddr;
/*The options start here. */
};
+#endif
struct ip_auth_hdr {
--
2.22.1
Powered by blists - more mailing lists
Confused about mailing lists and their use?
Read about mailing lists on Wikipedia
and check out these
guidelines on proper formatting of your messages.
