From 7962218dd85dcb4ebbd1f6fa01b565d129a258e2 Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Wed, 8 Jul 2009 22:38:48 +0100
Subject: Apply MTU and txqueuelen after creating the tunnel.

---
 net/ifconfig.sh.Linux.in | 23 ++++++++++++-----------
 net/iproute2.sh          | 20 ++++++++++----------
 2 files changed, 22 insertions(+), 21 deletions(-)

(limited to 'net')

diff --git a/net/ifconfig.sh.Linux.in b/net/ifconfig.sh.Linux.in
index 4fd2460..ae68b2b 100644
--- a/net/ifconfig.sh.Linux.in
+++ b/net/ifconfig.sh.Linux.in
@@ -261,6 +261,17 @@ _tunnel()
 
 ifconfig_pre_start()
 {
+	local tunnel=
+	eval tunnel=\$iptunnel_${IFVAR}
+	if [ -n "${tunnel}" ]; then
+		# Set our base metric to 1000
+		metric=1000
+		ebegin "Creating tunnel ${IFVAR}"
+		iptunnel add ${tunnel}
+		eend $? || return 1
+		_up
+	fi
+
 	# MTU support
 	local mtu=
 	eval mtu=\$mtu_${IFVAR}
@@ -271,17 +282,7 @@ ifconfig_pre_start()
 	eval len=\$txqueuelen_${IFVAR}
 	[ -n "${len}" ] && ifconfig "${IFACE}" txqueuelen "${len}"
 
-	local tunnel=
-
-	eval tunnel=\$iptunnel_${IFVAR}
-	[ -z "${tunnel}" ] && return 0
-
-	# Set our base metric to 1000
-	metric=1000
-	
-	ebegin "Creating tunnel ${IFVAR}"
-	iptunnel add ${tunnel}
-	eend $?
+	return 0
 }
 
 ifconfig_post_stop()
diff --git a/net/iproute2.sh b/net/iproute2.sh
index 08a4266..b1fe861 100644
--- a/net/iproute2.sh
+++ b/net/iproute2.sh
@@ -190,16 +190,6 @@ _tunnel()
 
 iproute2_pre_start()
 {
-	# MTU support
-	local mtu=
-	eval mtu=\$mtu_${IFVAR}
-	[ -n "${mtu}" ] && ip link set "${IFACE}" mtu "${mtu}"
-
-	# TX Queue Length support
-	local len=
-	eval len=\$txqueuelen_${IFVAR}
-	[ -n "${len}" ] && ip link set "${IFACE}" txqueuelen "${len}"
-
 	local tunnel=
 	eval tunnel=\$iptunnel_${IFVAR}
 	if [ -n "${tunnel}" ]; then
@@ -212,6 +202,16 @@ iproute2_pre_start()
 		_up	
 	fi
 
+	# MTU support
+	local mtu=
+	eval mtu=\$mtu_${IFVAR}
+	[ -n "${mtu}" ] && ip link set "${IFACE}" mtu "${mtu}"
+
+	# TX Queue Length support
+	local len=
+	eval len=\$txqueuelen_${IFVAR}
+	[ -n "${len}" ] && ip link set "${IFACE}" txqueuelen "${len}"
+
 	return 0
 }
 
-- 
cgit v1.2.3