X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fbase-files%2Ffiles%2Fetc%2Fhotplug.d%2Fnet%2F10-net;h=42ff29e799684fd6aef4063b9adacb2594d4fd95;hb=6447649ddd68c9bb8529ffb4f19a0053bf9eb4de;hp=06e5244447ec669f2194dc6c59e9a22b2859ed4c;hpb=e49ecf1adf017e6c29406e084f708b5e3228955c;p=openwrt-10.03%2F.git

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 06e524444..42ff29e79 100644
--- a/package/base-files/files/etc/hotplug.d/net/10-net
+++ b/package/base-files/files/etc/hotplug.d/net/10-net
@@ -3,9 +3,17 @@
 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;;
+		ath*) return 0;;
+		wlan*) return 0;;
 	esac
 
 	scan_interfaces
@@ -38,7 +46,7 @@ delif() {
 	for ifc in $interfaces; do
 		config_get iftype "$ifc" type
 		config_get ifs "$ifc" device
-		confdevs="$(uci get network.$ifc.ifname)"
+		confdevs="$(uci_get network.$ifc.ifname)"
 		for dev in $ifs; do
 			[ "${dev%%\.*}" = "$INTERFACE" ] && {
 				list_contains confdevs "$dev" || list_remove ifs "$dev"