From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 10 Aug 2009 23:54:44 +0000 (+0000)
Subject: merge fix from r17217, bump patch level
X-Git-Tag: 8.09.2~76
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d54edbf83923a4b544e4b2cbb02d91f366537b98;p=openwrt%2Fsvn-archive%2Fopenwrt.git

merge fix from r17217, bump patch level

SVN-Revision: 17218
---

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 1bc0e43aef..5e5c33764a 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=14.4
+PKG_RELEASE:=14.5
 
 PKG_FILE_DEPEND:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 
diff --git a/package/base-files/files/etc/hotplug.d/net/10-net b/package/base-files/files/etc/hotplug.d/net/10-net
index 06e5244447..f46dcd08d6 100644
--- a/package/base-files/files/etc/hotplug.d/net/10-net
+++ b/package/base-files/files/etc/hotplug.d/net/10-net
@@ -3,6 +3,12 @@
 include /lib/network
 
 addif() {
+	# Ensure that ipv6 is loaded, autoloading happens later but ipv6 might be
+	# required now for interface setup.
+	[ -d /proc/sys/net/ipv6 ] || {
+		grep -q '^ipv6' /etc/modules.d/* && insmod ipv6
+	}
+
 	# PPP devices are configured by pppd, no need to run setup_interface here
 	case "$INTERFACE" in
 		ppp*) return 0;;
diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index 5fe7e509aa..fb3c1a2a9a 100755
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -226,7 +226,6 @@ setup_interface() {
 	local vifmac="$4"
 	local proto
 	local macaddr
-	local hasipv6
 
 	[ -n "$config" ] || {
 		config=$(find_config "$iface")
@@ -244,14 +243,6 @@ setup_interface() {
 		sleep 1
 	}
 
-	# Check whether this interface has an IPv6 address
-	# defined and ensure that the kmod is loaded since
-	# ifup could be triggered before modules are loaded.
-	config_get hasipv6 "$config" ip6addr
-	[ -n "$hasipv6" ] && [ ! -d /proc/sys/net/ipv6 ] && {
-		grep -q '^ipv6' /etc/modules.d/* && insmod ipv6
-	}
-
 	# Interface settings
 	config_get mtu "$config" mtu
 	config_get macaddr "$config" macaddr