patch libteam - fix build in musl-libc

[Stuart Cardall]

- under musl-libc fixes :redefinition of 'struct ethhdr'

---

--- libteam-1.24/teamd/teamd_lw_arp_ping.c
+++ libteam-1.24.new/teamd/teamd_lw_arp_ping.c
@@ -20,7 +20,11 @@

#include <arpa/inet.h>
 #include <net/if_arp.h>
+#if defined(__GLIBC__)
 #include <linux/if_ether.h>
+#else
+#include <net/ethernet.h>
+#endif
 #include <netdb.h>
 #include <private/misc.h>
 #include "teamd.h"
--- libteam-1.24/teamd/teamd_lw_nsna_ping.c
+++ libteam-1.24.new/teamd/teamd_lw_nsna_ping.c
@@ -21,7 +21,11 @@
 #include <netdb.h>
 #include <netinet/ip6.h>
 #include <netinet/icmp6.h>
+#if defined(__GLIBC__)
 #include <linux/if_ether.h>
+#else
+#include <net/ethernet.h>
+#endif
 #include <private/misc.h>
 #include "teamd.h"
 #include "teamd_link_watch.h"
--- libteam-1.24/teamd/teamd_runner_lacp.c
+++ libteam-1.24.new/teamd/teamd_runner_lacp.c
@@ -23,14 +23,20 @@
 #include <unistd.h>
 #include <limits.h>
 #include <sys/ioctl.h>
+#if defined(__GLIBC__)
 #include <linux/if_ether.h>
+#else
+#include <net/ethernet.h>
+#endif
 #include <sys/socket.h>
 #include <linux/netdevice.h>
 #include <netinet/in.h>
 #include <errno.h>
 #include <team.h>
 #include <private/misc.h>
+#if defined(__GLIBC__)
 #include <net/ethernet.h>
+#endif

#include "teamd.h"
 #include "teamd_config.h"

[Jiri Pirko]

Sun, Jan 22, 2017 at 09:39:48PM CET, [e-mail] wrote:
> under musl-libc fixes :redefinition of 'struct ethhdr'

Stuart, please use SubmittingPatches document to se how to prepare and
send patch. Basically, please use "git commit -a -s" and "git send-email"

The subject should look like:
[patch libteam] what patch does

No "-" in the desctiption please.

Add your signed off line.

Thanks.
> --- libteam-1.24/teamd/teamd_lw_arp_ping.c
> +++ libteam-1.24.new/teamd/teamd_lw_arp_ping.c
> @@ -20,7 +20,11 @@
>
> #include <arpa/inet.h>
> #include <net/if_arp.h>
> +#if defined(__GLIBC__)
> #include <linux/if_ether.h>
> +#else
> +#include <net/ethernet.h>
> +#endif
> #include <netdb.h>
> #include <private/misc.h>
> #include "teamd.h"
> --- libteam-1.24/teamd/teamd_lw_nsna_ping.c
> +++ libteam-1.24.new/teamd/teamd_lw_nsna_ping.c
> @@ -21,7 +21,11 @@
> #include <netdb.h>
> #include <netinet/ip6.h>
> #include <netinet/icmp6.h>
> +#if defined(__GLIBC__)
> #include <linux/if_ether.h>
> +#else
> +#include <net/ethernet.h>
> +#endif
> #include <private/misc.h>
> #include "teamd.h"
> #include "teamd_link_watch.h"
> --- libteam-1.24/teamd/teamd_runner_lacp.c
> +++ libteam-1.24.new/teamd/teamd_runner_lacp.c
> @@ -23,14 +23,20 @@
> #include <unistd.h>
> #include <limits.h>
> #include <sys/ioctl.h>
> +#if defined(__GLIBC__)
> #include <linux/if_ether.h>
> +#else
> +#include <net/ethernet.h>
> +#endif
> #include <sys/socket.h>
> #include <linux/netdevice.h>
> #include <netinet/in.h>
> #include <errno.h>
> #include <team.h>
> #include <private/misc.h>
> +#if defined(__GLIBC__)
> #include <net/ethernet.h>
> +#endif
>
> #include "teamd.h"
> #include "teamd_config.h"