From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Fri, 4 Mar 2016 16:00:56 +0000 (+0100)
Subject: udhcpc: do not use -t NUM for counting "select" packets, use 3
X-Git-Tag: 1_25_0~112
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=86d9f60f3acc4a5d755912003278267f8e6f3e89;p=oweals%2Fbusybox.git

udhcpc: do not use -t NUM for counting "select" packets, use 3

Otherwise, "-t 0" usage may end up sending them forever
if server does not respond.

function                                             old     new   delta
udhcpc_main                                         2846    2836     -10

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 6c2b112f0..dfd5ca606 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -1501,7 +1501,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
 				packet_num = 0;
 				continue;
 			case REQUESTING:
-				if (!discover_retries || packet_num < discover_retries) {
+				if (packet_num < 3) {
 					/* send broadcast select packet */
 					send_select(xid, server_addr, requested_ip);
 					timeout = discover_timeout;