ead: use the new pcap features and the raw socket optimization to eliminate most...

[openwrt.git] / package / busybox / patches / 240-udhcpc_retries.patch

diff --git a/package/busybox/patches/240-udhcpc_retries.patch b/package/busybox/patches/240-udhcpc_retries.patch
index 3142eac..30f64e1 100644 (file)
--- a/package/busybox/patches/240-udhcpc_retries.patch
+++ b/package/busybox/patches/240-udhcpc_retries.patch
@@ -1,21 +1,20 @@
-diff -ur busybox.old/networking/udhcp/dhcpc.c busybox.dev/networking/udhcp/dhcpc.c
---- busybox.old/networking/udhcp/dhcpc.c       2006-11-10 00:17:26.000000000 +0100
-+++ busybox.dev/networking/udhcp/dhcpc.c       2006-11-10 00:17:10.000000000 +0100
-@@ -330,7 +330,7 @@
-                       /* timeout dropped to zero */
+--- a/networking/udhcp/dhcpc.c
++++ b/networking/udhcp/dhcpc.c
+@@ -352,7 +352,7 @@ int udhcpc_main(int argc ATTRIBUTE_UNUSE
+ 
                        switch (state) {
                        case INIT_SELECTING:
--                              if (packet_num < client_config.retries) {
-+                              if (!client_config.retries || (packet_num < client_config.retries)) {
+-                              if (packet_num < discover_retries) {
++                              if (!discover_retries || packet_num < discover_retries) {
                                        if (packet_num == 0)
                                                xid = random_xid();
  
-@@ -355,7 +355,7 @@
-                               break;
+@@ -382,7 +382,7 @@ int udhcpc_main(int argc ATTRIBUTE_UNUSE
+                               continue;
                        case RENEW_REQUESTED:
                        case REQUESTING:
--                              if (packet_num < client_config.retries) {
-+                              if (!client_config.retries || (packet_num < client_config.retries)) {
+-                              if (packet_num < discover_retries) {
++                              if (!discover_retries || packet_num < discover_retries) {
                                        /* send request packet */
-                                       if (state == RENEW_REQUESTED)
-                                               send_renew(xid, server_addr, requested_ip); /* unicast */
+                                       if (state == RENEW_REQUESTED) /* unicast */
+                                               send_renew(xid, server_addr, requested_ip);