]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
Don't include linux/if_bridge.h
authorNatanael Copa <ncopa@alpinelinux.org>
Wed, 29 Jan 2014 14:23:47 +0000 (14:23 +0000)
committerStéphane Graber <stgraber@ubuntu.com>
Wed, 29 Jan 2014 16:15:52 +0000 (16:15 +0000)
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>
src/lxc/network.c

index bd2a37c4b1e61ab6d8a909882c1ea0d405a2b4e6..34845d1a9d048f08b1b8b8dbe07c5e63968241bc 100644 (file)
@@ -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"