mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-04-20 01:26:38 +02:00
531e69840c
Not a lot of big changes in this release, mostly code shrinks and bug fixes here and there. Hence, I don't expect too much breakage. Most patches applied as is and didn't require any changes either. Nonetheless, I rebased the entire patchset and removed patches that were backported. The 0001-modutils-check-ELF-header-before-calling-finit_modul.patch should be superseded by an upstream modutils change which checks that if the loaded module file path ends in .ko and if not attempts to uncompress it first. Thereby preventing compressed modules to be passed to the kernel and causing a weird error to be emitted. Therefore, this patch was removed See: https://git.busybox.net/busybox/commit/?id=af5277f883e8fc2e0236aa9ecc5115ecaffd0ccb
59 lines
2.4 KiB
Diff
59 lines
2.4 KiB
Diff
From cb5ad0fcbc54dbe7f530d195b021f8ed289047b9 Mon Sep 17 00:00:00 2001
|
|
From: Natanael Copa <ncopa@alpinelinux.org>
|
|
Date: Thu, 4 Aug 2016 13:17:00 +0200
|
|
Subject: [PATCH] udhcpc: set default discover retries to 5
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Some slower nics needs more attempts to get a lease
|
|
|
|
---
|
|
networking/udhcp/d6_dhcpc.c | 4 ++--
|
|
networking/udhcp/dhcpc.c | 4 ++--
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
|
|
index 79cef1999..edebf983b 100644
|
|
--- a/networking/udhcp/d6_dhcpc.c
|
|
+++ b/networking/udhcp/d6_dhcpc.c
|
|
@@ -1138,7 +1138,7 @@ static void client_background(void)
|
|
//usage: "\n -s PROG Run PROG at DHCP events (default "CONFIG_UDHCPC6_DEFAULT_SCRIPT")"
|
|
//usage: "\n -B Request broadcast replies"
|
|
//usage: "\n -t N Send up to N discover packets"
|
|
-//usage: "\n -T SEC Pause between packets (default 3)"
|
|
+//usage: "\n -T SEC Pause between packets (default 5)"
|
|
//usage: "\n -A SEC Wait if lease is not obtained (default 20)"
|
|
//usage: USE_FOR_MMU(
|
|
//usage: "\n -b Background if lease is not obtained"
|
|
@@ -1183,7 +1183,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
|
|
llist_t *list_x = NULL;
|
|
int tryagain_timeout = 20;
|
|
int discover_timeout = 3;
|
|
- int discover_retries = 3;
|
|
+ int discover_retries = 5;
|
|
struct in6_addr srv6_buf;
|
|
struct in6_addr ipv6_buf;
|
|
struct in6_addr *requested_ipv6;
|
|
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
|
|
index e44086c2e..090fbcc07 100644
|
|
--- a/networking/udhcp/dhcpc.c
|
|
+++ b/networking/udhcp/dhcpc.c
|
|
@@ -1163,7 +1163,7 @@ static void client_background(void)
|
|
//usage: "\n -p FILE Create pidfile"
|
|
//usage: "\n -B Request broadcast replies"
|
|
//usage: "\n -t N Send up to N discover packets (default 3)"
|
|
-//usage: "\n -T SEC Pause between packets (default 3)"
|
|
+//usage: "\n -T SEC Pause between packets (default 5)"
|
|
//usage: "\n -A SEC Wait if lease is not obtained (default 20)"
|
|
//usage: USE_FOR_MMU(
|
|
//usage: "\n -b Background if lease is not obtained"
|
|
@@ -1207,7 +1207,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
|
|
llist_t *list_x = NULL;
|
|
int tryagain_timeout = 20;
|
|
int discover_timeout = 3;
|
|
- int discover_retries = 3;
|
|
+ int discover_retries = 5;
|
|
uint32_t server_id = server_id; /* for compiler */
|
|
uint32_t requested_ip = 0;
|
|
int packet_num;
|