brcm47xx: backport patch from kernel 2.6.37

[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 be452c0..c78dae5 100644 (file)
--- a/package/busybox/patches/240-udhcpc_retries.patch
+++ b/package/busybox/patches/240-udhcpc_retries.patch
@@ -1,6 +1,6 @@
 --- a/networking/udhcp/dhcpc.c
 +++ b/networking/udhcp/dhcpc.c
 --- a/networking/udhcp/dhcpc.c
 +++ b/networking/udhcp/dhcpc.c

-@@ -353,7 +353,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c
+@@ -1017,7 +1017,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c

  
                        switch (state) {
                        case INIT_SELECTING:
  
                        switch (state) {
                        case INIT_SELECTING:


@@ -8,13 +8,13 @@
 +                              if (!discover_retries || packet_num < discover_retries) {
                                        if (packet_num == 0)
                                                xid = random_xid();
 +                              if (!discover_retries || packet_num < discover_retries) {
                                        if (packet_num == 0)
                                                xid = random_xid();

- 
-@@ -384,7 +384,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c
+                                       /* broadcast */
+@@ -1046,7 +1046,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c
+                               packet_num = 0;

                                continue;
                                continue;

-                       case RENEW_REQUESTED:

                        case REQUESTING:
 -                              if (packet_num < discover_retries) {
 +                              if (!discover_retries || packet_num < discover_retries) {
                        case REQUESTING:
 -                              if (packet_num < discover_retries) {
 +                              if (!discover_retries || packet_num < discover_retries) {

-                                       /* send request packet */
-                                       if (state == RENEW_REQUESTED) /* unicast */
-                                               send_renew(xid, server_addr, requested_ip);
+                                       /* send broadcast select packet */
+                                       send_select(xid, server_addr, requested_ip);
+                                       timeout = discover_timeout;