[package] kernel: further fixes to kmod-gre packaging

[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 a201620..ea606ec 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.7.2/networking/udhcp/clientpacket.c
-===================================================================
---- busybox-1.7.2.orig/networking/udhcp/clientpacket.c 2007-10-30 15:35:00.000000000 -0500
-+++ busybox-1.7.2/networking/udhcp/clientpacket.c      2007-10-30 15:35:02.000000000 -0500
-@@ -74,6 +74,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;
-@@ -81,7 +82,8 @@
-               add_simple_option(packet.options, DHCP_REQUESTED_IP, requested);
+@@ -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);
  
-       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);
  }