Commit 47add7e5 by Natanael Copa Committed by Stéphane Graber

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: 's avatarNatanael Copa <ncopa@alpinelinux.org> Acked-by: 's avatarSerge E. Hallyn <serge.hallyn@ubuntu.com>
parent f9870943
...@@ -44,7 +44,6 @@ ...@@ -44,7 +44,6 @@
#include <linux/netlink.h> #include <linux/netlink.h>
#include <linux/rtnetlink.h> #include <linux/rtnetlink.h>
#include <linux/sockios.h> #include <linux/sockios.h>
#include <linux/if_bridge.h>
#include "nl.h" #include "nl.h"
#include "network.h" #include "network.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment