79 lines
1.7 KiB
Diff
79 lines
1.7 KiB
Diff
Source: John <johnz@posteo.net>
|
|
Upstream: Unknown
|
|
Reason: Fixes compilation with musl libc
|
|
|
|
--- ell/dhcp-transport.c
|
|
+++ ell/dhcp-transport.c
|
|
@@ -185,12 +183,12 @@
|
|
ip->saddr = L_CPU_TO_BE32(saddr);
|
|
ip->daddr = L_CPU_TO_BE32(daddr);
|
|
|
|
- udp->source = L_CPU_TO_BE16(sport);
|
|
- udp->dest = L_CPU_TO_BE16(dport);
|
|
+ udp->uh_sport = L_CPU_TO_BE16(sport);
|
|
+ udp->uh_dport = L_CPU_TO_BE16(dport);
|
|
|
|
- udp->len = L_CPU_TO_BE16(len + sizeof(*udp));
|
|
+ udp->uh_ulen = L_CPU_TO_BE16(len + sizeof(*udp));
|
|
|
|
- ip->check = udp->len;
|
|
+ ip->check = udp->uh_ulen;
|
|
|
|
iov[0].iov_base = &ip->ttl;
|
|
iov[0].iov_len = sizeof(*ip) - 8;
|
|
@@ -198,7 +196,7 @@
|
|
iov[1].iov_len = sizeof(*udp);
|
|
iov[2].iov_base = (void *) data;
|
|
iov[2].iov_len = len;
|
|
- udp->check = _dhcp_checksumv(iov, 3);
|
|
+ udp->uh_sum = _dhcp_checksumv(iov, 3);
|
|
|
|
ip->ttl = IPDEFTTL;
|
|
ip->check = 0;
|
|
--- ell/dhcp.c
|
|
+++ ell/dhcp.c
|
|
@@ -25,9 +25,9 @@
|
|
#endif
|
|
|
|
#include <netinet/ip.h>
|
|
+#include <net/ethernet.h>
|
|
#include <linux/types.h>
|
|
#include <linux/if_arp.h>
|
|
-#include <net/ethernet.h>
|
|
#include <errno.h>
|
|
#include <time.h>
|
|
|
|
--- monitor/nlmon.c
|
|
+++ monitor/nlmon.c
|
|
@@ -31,6 +31,8 @@
|
|
#include <sys/ioctl.h>
|
|
#include <sys/socket.h>
|
|
#include <arpa/inet.h>
|
|
+#include <net/ethernet.h>
|
|
+#include <netinet/ether.h>
|
|
#include <linux/if.h>
|
|
#include <linux/if_packet.h>
|
|
#include <linux/if_ether.h>
|
|
@@ -38,8 +40,6 @@
|
|
#include <linux/genetlink.h>
|
|
#include <linux/rtnetlink.h>
|
|
#include <linux/filter.h>
|
|
-#include <net/ethernet.h>
|
|
-#include <netinet/ether.h>
|
|
#include <ell/ell.h>
|
|
|
|
#ifndef ARPHRD_NETLINK
|
|
|
|
--- plugins/ofono.c
|
|
+++ plugins/ofono.c
|
|
@@ -653,7 +653,9 @@
|
|
* has been seen to happen.
|
|
*/
|
|
l_error("modem %s already found", path);
|
|
+#if defined(__GLIBC__)
|
|
__iwd_backtrace_print(2);
|
|
+#endif
|
|
exit(1);
|
|
}
|
|
|
|
|