From: Chih-Wei Huang <cwhuang@linux.org.tw>
Date: Thu, 13 Jun 2019 09:09:26 +0000 (+0800)
Subject: Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86
X-Git-Tag: android-x86-8.1-r2
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fdevice-generic-common.git;a=commitdiff_plain;h=67c1b4ff3c55498e1252147419f64faa8253c57d;hp=c60a711d9ed0de24145fd5121a127a9d74149296

Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86
---

diff --git a/init.sh b/init.sh
index a73721a..ab7f50d 100644
--- a/init.sh
+++ b/init.sh
@@ -15,6 +15,13 @@ function set_prop_if_empty()
 	[ -z "$(getprop $1)" ] && set_property "$1" "$2"
 }
 
+function rmmod_if_exist()
+{
+	for m in $*; do
+		[ -d /sys/module/$m ] && rmmod $m
+	done
+}
+
 function init_misc()
 {
 	# device information
@@ -30,6 +37,27 @@ function init_misc()
 	# enable sdcardfs if /data is not mounted on tmpfs or 9p
 	mount | grep /data\ | grep -qE 'tmpfs|9p'
 	[ $? -ne 0 ] && modprobe sdcardfs
+
+	# remove wl if it's not used
+	local wifi
+	if [ -d /sys/class/net/wlan0 ]; then
+		wifi=$(basename `readlink /sys/class/net/wlan0/device/driver`)
+		[ "$wifi" != "wl" ] && rmmod_if_exist wl
+	fi
+
+	# enable virt_wifi if needed
+	local eth=`getprop net.virt_wifi eth0`
+	if [ -d /sys/class/net/$eth -a "$VIRT_WIFI" != "0" ]; then
+		if [ -n "$wifi" -a "$VIRT_WIFI" = "1" ]; then
+			rmmod_if_exist iwlmvm $wifi
+		fi
+		if [ ! -d /sys/class/net/wlan0 ]; then
+			ifconfig $eth down
+			ip link set $eth name wifi_eth
+			ifconfig wifi_eth up
+			ip link add link wifi_eth name wlan0 type virt_wifi
+		fi
+	fi
 }
 
 function init_hal_audio()