From baf83a10a76c67be5c4aa08e71ac252b282533a2 Mon Sep 17 00:00:00 2001 From: Jimmy Chen Date: Thu, 3 Oct 2019 11:24:23 +0800 Subject: sdm660-common: Move supplicant service init to wpa_supplicant Bug: 138790309 Test: boot and wifi function is ok Change-Id: I35cf3e03566443e20799623045eacd423fd7f5c4 --- BoardConfigCommon.mk | 1 + rootdir/etc/init.qcom.rc | 15 --------------- wifi/wpa_supplicant_overlay.conf | 1 + 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index a3294c9..d2fdc6a 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -205,6 +205,7 @@ WIFI_DRIVER_FW_PATH_STA := "sta" WIFI_DRIVER_FW_PATH_P2P := "p2p" WIFI_DRIVER_OPERSTATE_PATH := "/sys/class/net/wlan0/operstate" WIFI_HIDL_FEATURE_DUAL_INTERFACE := true +WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true WPA_SUPPLICANT_VERSION := VER_0_8_X # Inherit the proprietary files diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 81cd6c4..6314795 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -587,21 +587,6 @@ service vendor.sensors.qti /vendor/bin/sensors.qti on property:sys.sysctl.tcp_adv_win_scale=* write /proc/sys/net/ipv4/tcp_adv_win_scale ${sys.sysctl.tcp_adv_win_scale} -service wpa_supplicant /vendor/bin/hw/wpa_supplicant \ - -O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1 -dd \ - -g@android:vendor_wpa_wlan0 -# we will start as root and wpa_supplicant will switch to user wifi -# after setting up the capabilities required for WEXT -# user wifi -# group wifi inet keystore - interface android.hardware.wifi.supplicant@1.0::ISupplicant default - interface android.hardware.wifi.supplicant@1.1::ISupplicant default - interface android.hardware.wifi.supplicant@1.2::ISupplicant default - class main - socket vendor_wpa_wlan0 dgram 660 wifi wifi - disabled - oneshot - service vendor.wigig_supplicant /vendor/bin/hw/wpa_supplicant \ -iwigig0 -Dnl80211 -c/data/vendor/wifi/wigig_supplicant.conf \ -m/data/vendor/wifi/wigig_p2p_supplicant.conf \ diff --git a/wifi/wpa_supplicant_overlay.conf b/wifi/wpa_supplicant_overlay.conf index acbcff7..793caab 100644 --- a/wifi/wpa_supplicant_overlay.conf +++ b/wifi/wpa_supplicant_overlay.conf @@ -4,3 +4,4 @@ tdls_external_control=1 interworking=1 hs20=1 auto_interworking=0 +driver_param=use_p2p_group_interface=1 -- cgit v1.2.3