mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-24 07:46:48 +00:00
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>
16 lines
680 B
Diff
16 lines
680 B
Diff
--- a/networking/udhcp/dhcpc.c
|
|
+++ b/networking/udhcp/dhcpc.c
|
|
@@ -1422,6 +1422,12 @@ int udhcpc_main(int argc UNUSED_PARAM, c
|
|
/* silence "uninitialized!" warning */
|
|
unsigned timestamp_before_wait = timestamp_before_wait;
|
|
|
|
+ /* When running on a bridge, the ifindex may have changed (e.g. if
|
|
+ * member interfaces were added/removed or if the status of the
|
|
+ * bridge changed).
|
|
+ * Workaround: refresh it here before processing the next packet */
|
|
+ udhcp_read_interface(client_config.interface, &client_config.ifindex, NULL, client_config.client_mac);
|
|
+
|
|
//bb_error_msg("sockfd:%d, listen_mode:%d", sockfd, listen_mode);
|
|
|
|
/* Was opening raw or udp socket here
|