From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 29 Jan 2014 14:23:47 +0000 (+0000)
Subject: Don't include linux/if_bridge.h
X-Git-Tag: lxc-1.0.0.beta4~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47add7e5b6c917cd9ee572f9d9e1c5a8f3d9f2fb;p=thirdparty%2Flxc.git

Don't include linux/if_bridge.h

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@alpinelinux.org>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/network.c b/src/lxc/network.c
index bd2a37c4b..34845d1a9 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"