wlan: enable wlan on origen

Change-Id: I0b938eae98510afa9b4c0ca50a302fbb4e740c1d
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

5 files changed, 18 insertions, 41 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 3011e0d..df5ee03 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -25,8 +25,9 @@ BOARD_HAVE_BLUETOOTH := true
 BOARD_HAVE_BLUETOOTH_BCM := false
 BOARD_HAVE_BLUETOOTH_CSR := true
 
-WPA_SUPPLICANT_VERSION := VER_0_6_X
+WPA_SUPPLICANT_VERSION := VER_0_8_X
 BOARD_WPA_SUPPLICANT_DRIVER := WEXT
+BOARD_WPA_SUPPLICANT_PRIVATE_LIB := private_lib_driver_cmd
 WIFI_DRIVER_MODULE_PATH := "/system/modules/ath6kl.ko"
 WIFI_DRIVER_MODULE_NAME := "ath6kl"
 
diff --git a/device.mk b/device.mk
index 1a8376b..f528722 100644
--- a/device.mk
+++ b/device.mk
@@ -13,8 +13,9 @@
 # limitations under the License.
 
 PRODUCT_COPY_FILES := \
-	device/linaro/origen/vold.fstab:system/etc/vold.fstab \
-	device/linaro/origen/egl.cfg:system/lib/egl/egl.cfg
+        device/linaro/origen/vold.fstab:system/etc/vold.fstab \
+        device/linaro/origen/egl.cfg:system/lib/egl/egl.cfg \
+        device/linaro/origen/wpa_supplicant.conf:system/etc/wifi/wpa_supplicant.conf
 
 PRODUCT_COPY_FILES += \
         device/linaro/origen/init.rc:root/init.rc \
diff --git a/init.origen.rc b/init.origen.rc
index aa3e6f0..ac2cffc 100644
--- a/init.origen.rc
+++ b/init.origen.rc
@@ -17,11 +17,6 @@ on boot
     setprop ro.product.device exynos4
     setprop wifi.interface wlan0
 
-    # create dhcpcd dir
-    mkdir /data/misc/dhcp 0770 dhcp dhcp
-    chmod 0770 /data/misc/dhcp
-    chmod 0666 /dev/pvrsrvkm
-
     # switch CPUfreq from performance to hotplug
     #write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor hotplug
     #write /sys/devices/system/cpu/cpufreq/hotplug/down_threshold 30
@@ -67,29 +62,6 @@ on boot
     chown system system /sys/class/graphics/fb0/overlays
     chown system system /sys/class/graphics/fb0/fit_to_screen
     chown system system /sys/class/graphics/fb1/overlays
-    chmod 0666 /dev/pvrsrvkm
-
-    # Add for wifi
-    mkdir /data/misc/wifi
-    mkdir /data/misc/wifi/sockets
-    chmod 0770 /data/misc/wifi
-    chmod 0770 /data/misc/wifi/sockets
-    chmod 0660 /data/misc/wifi/wpa_supplicant.conf
-    chown wifi wifi /data/misc/wifi
-    chown wifi wifi /data/misc/wifi/sockets
-    chown wifi wifi /data/misc/wifi/wpa_supplicant.conf
-
-    # wpa_supplicant socket (unix socket mode)
-    mkdir /data/system
-    mkdir /data/system/wpa_supplicant
-    chmod 0775 /data/system
-    chmod 0771 /data/system/wpa_supplicant
-    chown system system /data/system
-    chown wifi wifi /data/system/wpa_supplicant
-
-    # insmod wifi module
-    insmod /system/modules/cfg80211.ko
-    # insmod /system/modules/ath6kl.ko
 
     # Enable Android usb gadget functionality
     ## adb for the time being
@@ -98,24 +70,23 @@ on boot
     write /sys/class/android_usb/android0/enable 1
 
     insmod /system/modules/gator.ko
-
-# Initialize the SGX driver
-service pvrsrvinit /system/bin/pvrsrvinit
-    user root
-    oneshot
+    insmod /system/modules/cfg80211.ko
 
 service faketsd /system/bin/faketsd
     user bluetooth
     group bluetooth
     oneshot
 
-service wpa_supplicant /system/bin/wpa_supplicant -Dwext -iwlan0 -c/data/misc/wifi/wpa_supplicant.conf -dd
-    group system wifi inet
+service wpa_supplicant /system/bin/wpa_supplicant -Dwext -iwlan0 -dd
+    socket wpa_wlan0 dgram 660 wifi wifi
+    disabled
+    oneshot
+
+service dhcpcd_wlan0 /system/bin/dhcpcd -dABKL
     disabled
     oneshot
 
-service dhcpcd_wlan0 /system/bin/dhcpcd -d -B wlan0
-    group system dhcp
+service iprenew_wlan0 /system/bin/dhcpcd -n
     disabled
     oneshot
 
diff --git a/init.rc b/init.rc
index 76f8043..618d9bb 100644
--- a/init.rc
+++ b/init.rc
@@ -165,6 +165,7 @@ on post-fs-data
     # give system access to wpa_supplicant.conf for backup and restore
     mkdir /data/misc/wifi 0770 wifi wifi
     chmod 0660 /data/misc/wifi/wpa_supplicant.conf
+    mkdir /data/misc/wifi/sockets 0770 wifi wifi
     mkdir /data/local 0771 shell shell
     mkdir /data/local/tmp 0771 shell shell
     mkdir /data/data 0771 system system
diff --git a/wpa_supplicant.conf b/wpa_supplicant.conf
index 1690557..a08eb33 100755
--- a/wpa_supplicant.conf
+++ b/wpa_supplicant.conf
@@ -1,3 +1,6 @@
-ctrl_interface=DIR=/data/system/wpa_supplicant GROUP=wifi
+##### wpa_supplicant configuration file template #####
 update_config=1
+ctrl_interface=wlan0
+eapol_version=1
 ap_scan=1
+fast_reauth=1