06fa1c46fc
The following patches were removed:
010-networking-fix-uninitialized-memory-when-displaying-.patch
https://git.busybox.net/busybox/commit/?id=f2c043acfcf9dad9fd3d65821b81f89986bbe54e
030-ip-fix-problem-on-mips64-n64-big-endian-musl-systems.patch
https://git.busybox.net/busybox/commit/?id=4ab372d49a6e82b0bf097dedb96d26330c5f2d5f
204-udhcpc_src_ip_rebind.patch
https://git.busybox.net/busybox/commit/?id=abe8f7515aded80889d78c2c1c8947997918cf90
230-ntpd_delayed_resolve.patch
https://git.busybox.net/busybox/commit/?id=c8641962e4cbde48108ddfc1c105e3320778190d
https://git.busybox.net/busybox/commit/?id=e4caf1dd9ce8569371a0eeb77ccf02a572dc0f11
260-arping_missing_includes.patch
Not needed any more, still builds with musl for me.
Add in 92fd6e6f1a "busybox: fix arping applet building on musl"
The Kconfig files were updated with these commands:
cd config
../convert_menuconfig.pl .../build_dir/target-*/busybox-1.25.0
cd ..
./convert_defaults.pl < .../build_dir/target-*/busybox-1.25.0/.config > Config-defaults.in
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
18 lines
580 B
Diff
18 lines
580 B
Diff
--- a/networking/udhcp/dhcpc.c
|
|
+++ b/networking/udhcp/dhcpc.c
|
|
@@ -697,6 +697,7 @@ static int bcast_or_ucast(struct dhcp_pa
|
|
static NOINLINE int send_discover(uint32_t xid, uint32_t requested)
|
|
{
|
|
struct dhcp_packet packet;
|
|
+ static int msgs = 0;
|
|
|
|
/* Fill in: op, htype, hlen, cookie, chaddr fields,
|
|
* random xid field (we override it below),
|
|
@@ -714,6 +715,7 @@ static NOINLINE int send_discover(uint32
|
|
*/
|
|
add_client_options(&packet);
|
|
|
|
+ if (msgs++ < 3)
|
|
bb_error_msg("sending %s", "discover");
|
|
return raw_bcast_from_client_config_ifindex(&packet, INADDR_ANY);
|
|
}
|