busybox: update to 1.22.1

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

diff --git a/package/utils/busybox/patches/240-udhcpc_retries.patch b/package/utils/busybox/patches/240-udhcpc_retries.patch
deleted file mode 100644 (file)
index 0e26864..0000000
--- a/package/utils/busybox/patches/240-udhcpc_retries.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/networking/udhcp/dhcpc.c
-+++ b/networking/udhcp/dhcpc.c
-@@ -1319,7 +1319,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c
- 
-                       switch (state) {
-                       case INIT_SELECTING:
--                              if (packet_num < discover_retries) {
-+                              if (!discover_retries || packet_num < discover_retries) {
-                                       if (packet_num == 0)
-                                               xid = random_xid();
-                                       /* broadcast */
-@@ -1348,7 +1348,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c
-                               packet_num = 0;
-                               continue;
-                       case REQUESTING:
--                              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;