[lxc-devel] [PATCH 5/8] Don't include linux/if_bridge.h

[Serge Hallyn]

Quoting Natanael Copa (ncopa at alpinelinux.org):
> Instead rely on struct ethhdr from net/ethernet.h
> 
> This fixes build error with musl libc:
> In file included from /usr/include/linux/if_bridge.h:17:0,
>                  from network.c:47:
> /usr/include/linux/if_ether.h:133:8: error: redefinition of 'struct ethhdr'
>  struct ethhdr {
>         ^
> In file included from /usr/include/net/ethernet.h:10:0,
>                  from network.c:42:
> /usr/include/netinet/if_ether.h:93:8: note: originally defined here
>  struct ethhdr {
>         ^
> 
> Signed-off-by: Natanael Copa <ncopa at alpinelinux.org>

Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>

> ---
>  src/lxc/network.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/src/lxc/network.c b/src/lxc/network.c
> index bd2a37c..34845d1 100644
> --- a/src/lxc/network.c
> +++ b/src/lxc/network.c
> @@ -44,7 +44,6 @@
>  #include <linux/netlink.h>
>  #include <linux/rtnetlink.h>
>  #include <linux/sockios.h>
> -#include <linux/if_bridge.h>
>  
>  #include "nl.h"
>  #include "network.h"
> -- 
> 1.8.5.3
> 
> _______________________________________________
> lxc-devel mailing list
> lxc-devel at lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel