From 546ad1520b7a49103a5a657d831c7d414e0dc57e Mon Sep 17 00:00:00 2001 From: Jimmy Chen Date: Thu, 3 Oct 2019 11:24:23 +0800 Subject: [PATCH] sdm845-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 0cd7f8a..3a3507e 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -165,6 +165,7 @@ WIFI_DRIVER_STATE_CTRL_PARAM := "/dev/wlan" WIFI_DRIVER_STATE_OFF := "OFF" WIFI_DRIVER_STATE_ON := "ON" WIFI_HIDL_FEATURE_DUAL_INTERFACE := true +WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true WPA_SUPPLICANT_VERSION := VER_0_8_X # Inherit from the proprietary version diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 70fcdef..56b3f1f 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -572,21 +572,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 -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.cnss-daemon /vendor/bin/cnss-daemon -n -l class late_start user system 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