X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/a2e6a5c0995cbd0e5ecd95ddb42d2c67f3c28c59..77ec3b2de9bb1880b258ec6aaf4949f146f6fd8d:/package/busybox/patches/240-udhcpc_retries.patch?ds=inline diff --git a/package/busybox/patches/240-udhcpc_retries.patch b/package/busybox/patches/240-udhcpc_retries.patch index 3142eac6e..a9f4f3d1e 100644 --- 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 +@@ -1257,7 +1257,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c + 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; - case RENEW_REQUESTED: + /* broadcast */ +@@ -1286,7 +1286,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c + packet_num = 0; + continue; case REQUESTING: -- if (packet_num < client_config.retries) { -+ if (!client_config.retries || (packet_num < client_config.retries)) { - /* send request packet */ - if (state == RENEW_REQUESTED) - send_renew(xid, server_addr, requested_ip); /* unicast */ +- if (packet_num < discover_retries) { ++ if (!discover_retries || packet_num < discover_retries) { + /* send broadcast select packet */ + send_select(xid, server_addr, requested_ip); + timeout = discover_timeout;