| Message ID | 0516b7e4ce841146f759473be197ce252878f8ec.1428329893.git.alex.suykov@gmail.com |
|---|---|
| State | Accepted, archived |
| Commit | 6423e3e5cdc1f79625dbf90ff6444b0ad8b02185 |
| Headers | show |
On Monday 06 April 2015 17:29:13 Alex Suykov wrote: > musl does not allow including netinet/* and linux/* headers together. > batctl includes netinet/if_ether.h indirectly via net/ethernet.h, > so netinet/if_ether.h must be used instead of linux/if_ether.h. > > Signed-off-by: Alex Suykov <alex.suykov at gmail.com> Acked-by: Sven Eckelmann <sven@narfation.org> > --- > v2: updated to work with #include <linux/types.h> in packet.h introduced by > https://lists.open-mesh.org:443/pipermail/b.a.t.m.a.n/2015-April/012961.html > and ported to batctl by patch 1/2 in this set. > > ping.c | 2 +- > tcpdump.h | 2 +- > traceroute.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/ping.c b/ping.c > index bdca222..7880a82 100644 > --- a/ping.c > +++ b/ping.c > @@ -34,7 +34,7 @@ > #include <stdint.h> > #include <sys/select.h> > #include <sys/time.h> > -#include <linux/if_ether.h> > +#include <netinet/if_ether.h> > > #include "main.h" > #include "ping.h" > diff --git a/tcpdump.h b/tcpdump.h > index 5d936f2..3c9126c 100644 > --- a/tcpdump.h > +++ b/tcpdump.h > @@ -23,7 +23,7 @@ > #define _BATCTL_TCPDUMP_H > > #include <netpacket/packet.h> > -#include <linux/if_ether.h> > +#include <netinet/if_ether.h> > #include <net/if_arp.h> > #include <sys/types.h> > #include "main.h" > diff --git a/traceroute.c b/traceroute.c > index 4ebfec2..373fe90 100644 > --- a/traceroute.c > +++ b/traceroute.c > @@ -22,13 +22,13 @@ > > > #include <netinet/in.h> > +#include <netinet/if_ether.h> > #include <errno.h> > #include <stdio.h> > #include <stdlib.h> > #include <unistd.h> > #include <fcntl.h> > #include <string.h> > -#include <linux/if_ether.h> > #include <stddef.h> > #include <sys/select.h> > #include <sys/time.h>
On Monday, April 06, 2015 17:29:13 Alex Suykov wrote: > musl does not allow including netinet/* and linux/* headers together. > batctl includes netinet/if_ether.h indirectly via net/ethernet.h, > so netinet/if_ether.h must be used instead of linux/if_ether.h. > > Signed-off-by: Alex Suykov <alex.suykov at gmail.com> > --- > v2: updated to work with #include <linux/types.h> in packet.h introduced by > https://lists.open-mesh.org:443/pipermail/b.a.t.m.a.n/2015-April/012961.html > and ported to batctl by patch 1/2 in this set. > > ping.c | 2 +- > tcpdump.h | 2 +- > traceroute.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) Applied in revision 6423e3e. Thanks, Marek
diff --git a/ping.c b/ping.c index bdca222..7880a82 100644 --- a/ping.c +++ b/ping.c @@ -34,7 +34,7 @@ #include <stdint.h> #include <sys/select.h> #include <sys/time.h> -#include <linux/if_ether.h> +#include <netinet/if_ether.h> #include "main.h" #include "ping.h" diff --git a/tcpdump.h b/tcpdump.h index 5d936f2..3c9126c 100644 --- a/tcpdump.h +++ b/tcpdump.h @@ -23,7 +23,7 @@ #define _BATCTL_TCPDUMP_H #include <netpacket/packet.h> -#include <linux/if_ether.h> +#include <netinet/if_ether.h> #include <net/if_arp.h> #include <sys/types.h> #include "main.h" diff --git a/traceroute.c b/traceroute.c index 4ebfec2..373fe90 100644 --- a/traceroute.c +++ b/traceroute.c @@ -22,13 +22,13 @@ #include <netinet/in.h> +#include <netinet/if_ether.h> #include <errno.h> #include <stdio.h> #include <stdlib.h> #include <unistd.h> #include <fcntl.h> #include <string.h> -#include <linux/if_ether.h> #include <stddef.h> #include <sys/select.h> #include <sys/time.h>
musl does not allow including netinet/* and linux/* headers together. batctl includes netinet/if_ether.h indirectly via net/ethernet.h, so netinet/if_ether.h must be used instead of linux/if_ether.h. Signed-off-by: Alex Suykov <alex.suykov at gmail.com> --- v2: updated to work with #include <linux/types.h> in packet.h introduced by https://lists.open-mesh.org:443/pipermail/b.a.t.m.a.n/2015-April/012961.html and ported to batctl by patch 1/2 in this set. ping.c | 2 +- tcpdump.h | 2 +- traceroute.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)