Skip to contentSkip to conversation

iproute2: Fix musl compatibility

PATCH In review Loganaden Velvindron 3 participants 4 messages Feb 22, 2016 – Mar 2, 2016

Subsystems (4)
Networking Network drivers netfilter Ethernet bridge
lore
Share & tools
lore

Loganaden Velvindron

author
#0 lore raw

PATCH 1/1 iproute2: Fix musl compatibility

Don't redefine in6_addr due to including linux/in6.h and also fix the case of MAXPATHLEN constant not found.

(Original patch from VoidLinux)

Signed-off-by Loganaden Velvindron <[email protected]>
---
 include/linux/if_bridge.h | 1 -
 include/linux/netfilter.h | 2 --
 include/linux/xfrm.h      | 1 -
 include/utils.h           | 1 +
 4 files changed, 1 insertion(+), 4 deletions(-)
include/linux/if_bridge.h +0 -1
index ee197a3..f823aa4 100644
@@ -15,7 +15,6 @@
 
 #include <linux/types.h>
 #include <linux/if_ether.h>
-#include <linux/in6.h>
 
 #define SYSFS_BRIDGE_ATTR	"bridge"
 #define SYSFS_BRIDGE_FDB	"brforward"
include/linux/netfilter.h +0 -2
index b71b4c9..3e4e6ae 100644
@@ -4,8 +4,6 @@
 #include <linux/types.h>
 
 #include <linux/sysctl.h>
-#include <linux/in.h>
-#include <linux/in6.h>
 
 /* Responses from hook functions. */
 #define NF_DROP 0
include/linux/xfrm.h +0 -1
index b8f5451..a9761a5 100644
@@ -1,7 +1,6 @@
 #ifndef _LINUX_XFRM_H
 #define _LINUX_XFRM_H
 
-#include <linux/in6.h>
 #include <linux/types.h>
 
 /* All of the structures in this file may not change size as they are
include/utils.h +1 -0
index c43427c..debcdde 100644
@@ -1,6 +1,7 @@
 #ifndef __UTILS_H__
 #define __UTILS_H__ 1
 
+#include <sys/param.h> /* MAXPATHLEN */
 #include <sys/types.h>
 #include <asm/types.h>
 #include <resolv.h>
Signature · 1 line
2.7.0
#2 lore raw
In reply to Loganaden Velvindron
Quoted 6 lines · On Mon, 22 Feb 2016 03:34:48 -0800 Loganaden Velvindron <[email protected]>…

Don't redefine in6_addr due to including linux/in6.h and also fix the case of MAXPATHLEN constant not found.

(Original patch from VoidLinux)

Signed-off-by Loganaden Velvindron <[email protected]>

I was waiting for others who had more to say on this.
Ok with providing small fixes, but can't really guarantee iproute to work with other libraries.

#3 lore raw
In reply to Loganaden Velvindron

include/linux/netfilter.h line 8

Quoted 12 lines · On Mon, 22 Feb 2016 03:34:48 -0800 Loganaden Velvindron <[email protected]>…
include/linux/netfilter.h +0 -2
index b71b4c9..3e4e6ae 100644
@@ -4,8 +4,6 @@
 #include <linux/types.h>
 
 #include <linux/sysctl.h>
-#include <linux/in.h>
-#include <linux/in6.h>
 
 /* Responses from hook functio

Sorry, I have to reject this.
All include files in include/linux come from headers automatically generated from upstream Linux source. This is the only way to ensure long term ABI/API consistency with kernel.

Either fix musl or submit patches to upstream kernel and get them merged.