busybox: refresh patches

[openwrt.git] / package / busybox / patches / 242-udhcpc_msgs.patch

diff --git a/package/busybox/patches/242-udhcpc_msgs.patch b/package/busybox/patches/242-udhcpc_msgs.patch
index 4ec99af..7d390f1 100644 (file)
--- a/package/busybox/patches/242-udhcpc_msgs.patch
+++ b/package/busybox/patches/242-udhcpc_msgs.patch
@@ -1,22 +1,18 @@
-Index: busybox-1.4.2/networking/udhcp/clientpacket.c
-===================================================================
---- busybox-1.4.2.orig/networking/udhcp/clientpacket.c 2007-06-04 13:21:32.270070872 +0200
-+++ busybox-1.4.2/networking/udhcp/clientpacket.c      2007-06-04 13:21:33.813836184 +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);
  }