rt2800pci: add back ifdown hang workaround that was accidentally dropped during a...

[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 efe8e9a..ea606ec 100644 (file)
--- a/package/busybox/patches/242-udhcpc_msgs.patch
+++ b/package/busybox/patches/242-udhcpc_msgs.patch
@@ -1,18 +1,18 @@
---- a/networking/udhcp/clientpacket.c
-+++ b/networking/udhcp/clientpacket.c
-@@ -101,6 +101,7 @@
- int send_discover(uint32_t xid, uint32_t requested)
+--- a/networking/udhcp/dhcpc.c
++++ b/networking/udhcp/dhcpc.c
+@@ -428,6 +428,7 @@ static int raw_bcast_from_client_config_
+ static 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;
 +      static int msgs = 0;
  
        init_packet(&packet, DHCPDISCOVER);
        packet.xid = xid;

-@@ -113,6 +114,7 @@
- 
-       add_param_req_option(&packet);
+@@ -438,6 +439,7 @@ static int send_discover(uint32_t xid, u
+       udhcp_add_simple_option(&packet, DHCP_MAX_SIZE, htons(576));
+       add_client_options(&packet);

  
 +      if (msgs++ < 3)
        bb_info_msg("Sending discover...");
  
 +      if (msgs++ < 3)
        bb_info_msg("Sending discover...");

-       return udhcp_send_raw_packet(&packet, INADDR_ANY, CLIENT_PORT, INADDR_BROADCAST,
-                       SERVER_PORT, MAC_BCAST_ADDR, client_config.ifindex);
+       return raw_bcast_from_client_config_ifindex(&packet);
+ }