upgrade busybox to v1.11.1 and add current upstream fixes

[openwrt/staging/florian.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 7a655376dcc39ec0bb647dd662a8275841130db3..2e0ef118f4770d44edeb194bb0c9eaeb8cc443d5 100644 (file)
--- a/package/busybox/patches/240-udhcpc_retries.patch
+++ b/package/busybox/patches/240-udhcpc_retries.patch
@@ -1,22 +1,20 @@
-Index: busybox-1.7.2/networking/udhcp/dhcpc.c
-===================================================================
---- busybox-1.7.2.orig/networking/udhcp/dhcpc.c        2007-10-30 15:35:00.000000000 -0500
-+++ busybox-1.7.2/networking/udhcp/dhcpc.c     2007-10-30 15:35:01.000000000 -0500
-@@ -334,7 +334,7 @@
-                       /* timeout dropped to zero */
+--- a/networking/udhcp/dhcpc.c
++++ b/networking/udhcp/dhcpc.c
+@@ -352,7 +352,7 @@
+ 
                        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();
  
-@@ -360,7 +360,7 @@
-                               break;
+@@ -382,7 +382,7 @@
+                               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);