X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/0f48302e7a1b532950e310f279a7e4ffdd9a9872..c437fa8fdf58c6dd78883a9715de6904eb35a40a:/package/busybox/patches/242-udhcpc_msgs.patch?ds=sidebyside

diff --git a/package/busybox/patches/242-udhcpc_msgs.patch b/package/busybox/patches/242-udhcpc_msgs.patch
index e8bdfeb13..7d390f166 100644
--- a/package/busybox/patches/242-udhcpc_msgs.patch
+++ b/package/busybox/patches/242-udhcpc_msgs.patch
@@ -1,21 +1,18 @@
-diff -ur busybox.old/networking/udhcp/clientpacket.c busybox.dev/networking/udhcp/clientpacket.c
---- busybox.old/networking/udhcp/clientpacket.c	2007-03-18 17:59:24.000000000 +0100
-+++ busybox.dev/networking/udhcp/clientpacket.c	2007-05-14 16:03:26.698979472 +0200
-@@ -78,6 +78,7 @@
- int send_discover(unsigned long xid, unsigned long requested)
+--- a/networking/udhcp/dhcpc.c
++++ b/networking/udhcp/dhcpc.c
+@@ -436,6 +436,7 @@ static int raw_bcast_from_client_config_
+ static NOINLINE int send_discover(uint32_t xid, uint32_t requested)
  {
- 	struct dhcpMessage packet;
+ 	struct dhcp_packet packet;
 +	static int msgs = 0;
  
- 	init_packet(&packet, DHCPDISCOVER);
- 	packet.xid = xid;
-@@ -85,7 +86,8 @@
- 		add_simple_option(packet.options, DHCP_REQUESTED_IP, requested);
+ 	/* Fill in: op, htype, hlen, cookie, chaddr fields,
+ 	 * random xid field (we override it below),
+@@ -453,6 +454,7 @@ static NOINLINE int send_discover(uint32
+ 	 */
+ 	add_client_options(&packet);
  
- 	add_requests(&packet);
--	bb_info_msg("Sending discover...");
 +	if (msgs++ < 3)
-+		bb_info_msg("Sending discover...");
- 	return udhcp_raw_packet(&packet, INADDR_ANY, CLIENT_PORT, INADDR_BROADCAST,
- 			SERVER_PORT, MAC_BCAST_ADDR, client_config.ifindex);
+ 	bb_info_msg("Sending discover...");
+ 	return raw_bcast_from_client_config_ifindex(&packet);
  }