File 0006-Fixed-ipv6-dad-link-ready-wait-time-calculation.patch of Package sysconfig.import5631
From bf78e8f7759250a33326fc8afeff7b646fb25650 Mon Sep 17 00:00:00 2001
From: Marius Tomaschewski <mt@suse.com>
Date: Tue, 27 Sep 2011 13:28:49 +0200
Subject: [PATCH] Cleanup verify flag after status update
Signed-off-by: Marius Tomaschewski <mt@suse.com>
---
scripts/ifup | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/scripts/ifup b/scripts/ifup
index 9ed8beb..6fc55ec 100755
--- a/scripts/ifup
+++ b/scripts/ifup
@@ -1232,8 +1232,11 @@ case "$BOOTPROTO$SKIP_MAIN_PART" in
if [ "$retcode" = "$R_SUCCESS" ] ; then
v=`read_cached_config_data verify $INTERFACE`
s=`read_cached_config_data status $INTERFACE`
- if test "$v" = "status" -a "$s" = "connecting" ; then
- write_cached_config_data status connected $INTERFACE
+ if test "$v" = "status" ; then
+ if test "$s" = "connecting" ; then
+ write_cached_config_data status connected $INTERFACE
+ fi
+ delete_from_cached_config_data verify "" $INTERFACE
commit_cached_config_data $INTERFACE
fi
fi
--
1.7.7
From 431d319e8b9d4714e6476d519fb9702350c9da0b Mon Sep 17 00:00:00 2001
From: Marius Tomaschewski <mt@suse.com>
Date: Thu, 5 Jan 2012 17:50:10 +0100
Subject: [PATCH] Fixed ipv6 dad / link ready wait time calculation
(bnc#697929)
Signed-off-by: Marius Tomaschewski <mt@suse.com>
---
scripts/functions | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/functions b/scripts/functions
index 0ed67ee..c56d1d7 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -163,7 +163,7 @@ link_ready_wait ()
local iface=$1
local -i wsecs=${2:-0}
local -i uwait=25000
- local -i loops=$(((wsecs * 100000) / $uwait))
+ local -i loops=$(((wsecs * 1000000) / $uwait))
local -i loop=0 ret=0
link_ready_check "$iface" ; ret=$?
@@ -179,7 +179,7 @@ ipv6_addr_dad_wait()
local iface=$1
local -i wsecs=${2:-0}
local -i uwait=25000
- local -i loops=$(((wsecs * 100000) / $uwait))
+ local -i loops=$(((wsecs * 1000000) / $uwait))
local -i loop=0 ret=0
ipv6_addr_dad_check "$iface" ; ret=$?
--
1.7.7
From 3caea6d006bf054399bcbed1c4a17545437b07f9 Mon Sep 17 00:00:00 2001
From: Marius Tomaschewski <mt@suse.com>
Date: Thu, 5 Jan 2012 17:56:33 +0100
Subject: [PATCH] Use link_ready_wait instead of up flag check loop
A loop checking the link UP flag was immediately successful
and thus useless. Use a short 3 sec link_ready_wait instead
to give the kernel some time to apply scope local address
and start async tasks like IPv6 dad and avoid some of the
initial send errors reported by dhclient6 (bnc#697929).
Signed-off-by: Marius Tomaschewski <mt@suse.com>
---
scripts/ifup-dhcp | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/ifup-dhcp b/scripts/ifup-dhcp
index 1052a16..48234e1 100755
--- a/scripts/ifup-dhcp
+++ b/scripts/ifup-dhcp
@@ -677,12 +677,12 @@ case "$ACTION" in
debug "Activating interface $INTERFACE"
if ! is_iface_up $INTERFACE ; then
+
ip link set $INTERFACE up ${MTU:+mtu $MTU} \
${LLADDR:+address $LLADDR} $LINK_OPTIONS
- for ((count=200; count >= 0; count--)) ; do
- is_iface_up $INTERFACE && break
- usleep 25000
- done
+
+ # wait a bit or dhclient(6) may produce false send errors
+ link_ready_wait "$INTERFACE" 3
# (optionally) wait until a device is really configured
sleep ${DHCLIENT_SLEEP:-0}
--
1.7.7