diff options
Diffstat (limited to 'networking/ifplugd.c')
-rw-r--r-- | networking/ifplugd.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/networking/ifplugd.c b/networking/ifplugd.c index fef7a5ac9..f0defb5c8 100644 --- a/networking/ifplugd.c +++ b/networking/ifplugd.c | |||
@@ -38,7 +38,17 @@ | |||
38 | #include <linux/mii.h> | 38 | #include <linux/mii.h> |
39 | #include <linux/ethtool.h> | 39 | #include <linux/ethtool.h> |
40 | #ifdef HAVE_NET_ETHERNET_H | 40 | #ifdef HAVE_NET_ETHERNET_H |
41 | # include <net/ethernet.h> | 41 | /* musl breakage: |
42 | * In file included from /usr/include/net/ethernet.h:10, | ||
43 | * from networking/ifplugd.c:41: | ||
44 | * /usr/include/netinet/if_ether.h:96: error: redefinition of 'struct ethhdr' | ||
45 | * | ||
46 | * Build succeeds without it on musl. Commented it out. | ||
47 | * If on your system you need it, consider removing <linux/ethtool.h> | ||
48 | * and copy-pasting its definitions here (<linux/ethtool.h> is what pulls in | ||
49 | * conflicting definition of struct ethhdr on musl). | ||
50 | */ | ||
51 | /* # include <net/ethernet.h> */ | ||
42 | #endif | 52 | #endif |
43 | #include <linux/netlink.h> | 53 | #include <linux/netlink.h> |
44 | #include <linux/rtnetlink.h> | 54 | #include <linux/rtnetlink.h> |
@@ -48,6 +58,10 @@ | |||
48 | #define __user | 58 | #define __user |
49 | #include <linux/wireless.h> | 59 | #include <linux/wireless.h> |
50 | 60 | ||
61 | #ifndef ETH_ALEN | ||
62 | # define ETH_ALEN 6 | ||
63 | #endif | ||
64 | |||
51 | /* | 65 | /* |
52 | From initial port to busybox, removed most of the redundancy by | 66 | From initial port to busybox, removed most of the redundancy by |
53 | converting implementation of a polymorphic interface to the strict | 67 | converting implementation of a polymorphic interface to the strict |