From 00a3574cefe990ce45c04e256a9fc2d4c66e003d Mon Sep 17 00:00:00 2001 From: Jimmy Chen Date: Thu, 3 Oct 2019 11:24:23 +0800 Subject: [PATCH] Move supplicant service init to wpa_supplicant Bug: 138790309 Test: boot and wifi function is ok Change-Id: I35cf3e03566443e20799623045eacd423fd7f5c4 Signed-off-by: DennySPb --- BoardConfig.mk | 2 +- rootdir/etc/init.qcom.rc | 34 +------------------------------- wifi/wpa_supplicant_overlay.conf | 1 + 3 files changed, 3 insertions(+), 34 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index e088e5e..0578c03 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -139,6 +139,6 @@ WIFI_DRIVER_DEFAULT := qca_cld3 WIFI_DRIVER_STATE_CTRL_PARAM := "/dev/wlan" WIFI_DRIVER_STATE_OFF := "OFF" WIFI_DRIVER_STATE_ON := "ON" -WIFI_HIDL_FEATURE_AWARE := true +WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true WIFI_HIDL_FEATURE_DUAL_INTERFACE := true WPA_SUPPLICANT_VERSION := VER_0_8_X diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 4e7d61b..b59056e 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -638,38 +638,6 @@ on property:ro.data.large_tcp_window_size=true 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 \ - -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 - 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 \ - -O/data/vendor/wifi/wigig_sockets -dd \ - -e/data/vendor/wifi/wigig_entropy.bin -g@android:wigig/wpa_wigig0 \ - -S wigigsvc - # 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 wigig/wpa_wigig0 dgram 660 wifi wifi - disabled - oneshot - # Data Migration service vendor.move_wifi_data /system/bin/move_wifi_data.sh class main @@ -767,7 +735,7 @@ service wifi_ftmd /system/vendor/bin/wifi_ftmd on property:vendor.wifi.ftmd.load=true insmod /system/lib/modules/pronto/pronto_wlan.ko con_mode=5 -service cnss-daemon /system/vendor/bin/cnss-daemon -n -l +service vendor.cnss-daemon /vendor/bin/cnss-daemon -n -l class late_start user system group system inet net_admin wifi diff --git a/wifi/wpa_supplicant_overlay.conf b/wifi/wpa_supplicant_overlay.conf index b12fd69..779bdde 100644 --- a/wifi/wpa_supplicant_overlay.conf +++ b/wifi/wpa_supplicant_overlay.conf @@ -3,3 +3,4 @@ p2p_disabled=1 tdls_external_control=1 wowlan_triggers=magic_pkt bss_max_count=400 +driver_param=use_p2p_group_interface=1