Merge pull request #153 from francois-berder-imgtec/fix-mac

Set MAC address while inserting wifi driver
CreatorDev · Sep 23, 2016 · 777e4b6 · 777e4b6
2 parents ace26f2 + 2475b70
commit 777e4b6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/target/linux/pistachio/base-files/etc/init.d/set_mac b/target/linux/pistachio/base-files/etc/init.d/set_mac
@@ -7,11 +7,6 @@ STOP=15
 
 start()
 {
-    generate_mac $WIFI_OTP_REG0
-    ifconfig wlan0 down
-    ifconfig wlan0 hw ether $MAC
-    ifconfig wlan0 up
-
     generate_mac $SOFTAP_OTP_REG0
     uci set wireless.ap.macaddr=$MAC
     uci commit wireless

diff --git a/target/linux/pistachio/base-files/etc/init.d/uccp420wlan b/target/linux/pistachio/base-files/etc/init.d/uccp420wlan
@@ -0,0 +1,16 @@
+#!/bin/sh /etc/rc.common
+
+. /lib/functions/mac.sh
+
+START=10
+STOP=10
+
+start() {
+	generate_mac $WIFI_OTP_REG0
+	local mac_param="mac_addr=\"$(echo $MAC | sed 's/://g')\""
+	insmod uccp420wlan $mac_param
+}
+
+stop() {
+	rmmod uccp420wlan
+}
diff --git a/target/linux/pistachio/modules.mk b/target/linux/pistachio/modules.mk
@@ -222,7 +222,6 @@ define KernelPackage/uccp420wlan
     CONFIG_MWIFIEX=n \
     CONFIG_RSI_91X=n
   FILES:=$(LINUX_DIR)/drivers/net/wireless/uccp420wlan/uccp420wlan.ko
-  AUTOLOAD:=$(call AutoLoad,32,uccp420wlan)
 endef
 
 define KernelPackage/uccp420wlan/description