netinet/ip.h: Add UAPI definition guard for iphdr

Submitted by A. Wilcox on Dec. 22, 2019, 6:06 a.m.

Details

Message ID 20191222060646.7809-1-AWilcox@Wilcox-Tech.com
State New
Series "netinet/ip.h: Add UAPI definition guard for iphdr"
Headers show

Commit Message

A. Wilcox Dec. 22, 2019, 6:06 a.m.
This ensures that the musl definition of 'struct iphdr' does not conflict
with the Linux kernel UAPI definition of it.

Some software, i.e. net-tools, will not compile against 5.4 kernel headers
without this patch and the corresponding Linux kernel patch.
---
 include/netinet/ip.h | 2 ++
 1 file changed, 2 insertions(+)

Patch hide | download patch | download mbox

diff --git a/include/netinet/ip.h b/include/netinet/ip.h
index 8b6d7fef..0ae132a5 100644
--- a/include/netinet/ip.h
+++ b/include/netinet/ip.h
@@ -190,6 +190,8 @@  struct ip_timestamp {
 
 #define	IP_MSS		576
 
+#define __UAPI_DEF_IPHDR	0
+
 #ifdef __cplusplus
 }
 #endif