[PATCH] iproute2: Fix musl compatibility

[PATCH] iproute2: Fix musl compatibility

[Loganaden Velvindron]

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 <logan@hackers.mu>
---
 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(-)

diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
index ee197a3..f823aa4 100644
--- a/include/linux/if_bridge.h
+++ b/include/linux/if_bridge.h
@@ -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"
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
index b71b4c9..3e4e6ae 100644
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
@@ -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
diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
index b8f5451..a9761a5 100644
--- a/include/linux/xfrm.h
+++ b/include/linux/xfrm.h
@@ -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
diff --git a/include/utils.h b/include/utils.h
index c43427c..debcdde 100644
--- a/include/utils.h
+++ b/include/utils.h
@@ -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>
-- 
2.7.0

Re: [PATCH] iproute2: Fix musl compatibility

[Loganaden Velvindron]

ping stephen.

Re: [PATCH] iproute2: Fix musl compatibility

[Stephen Hemminger]

On Mon, 22 Feb 2016 03:34:48 -0800
Loganaden Velvindron <logan@hackers.mu> wrote:

> 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 <logan@hackers.mu>

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. 

Re: [PATCH] iproute2: Fix musl compatibility

[Stephen Hemminger]

On Mon, 22 Feb 2016 03:34:48 -0800
Loganaden Velvindron <logan@hackers.mu> wrote:

> diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
> index b71b4c9..3e4e6ae 100644
> --- a/include/linux/netfilter.h
> +++ b/include/linux/netfilter.h
> @@ -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.