1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00

upgrade busybox to v1.11.1 and add current upstream fixes

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12348 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
kaloz
2008-08-20 14:00:34 +00:00
parent e90b272ea7
commit ac2d02c3e0
58 changed files with 2195 additions and 1232 deletions

View File

@@ -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);