Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aaa741f0 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "wil6210: increase PCP stop command timeout"

parents 4b2634cf a5140924

drivers/net/wireless/ath/wil6210/main.c

+2 −1
Original line number Diff line number Diff line
@@ -1595,7 +1595,8 @@ int wil_reset(struct wil6210_priv *wil, bool load_fw) 
	if (wil->hw_version == HW_VER_UNKNOWN)

		return -ENODEV;



	if (test_bit(WIL_PLATFORM_CAPA_T_PWR_ON_0, wil->platform_capa)) {

	if (test_bit(WIL_PLATFORM_CAPA_T_PWR_ON_0, wil->platform_capa) &&

	    wil->hw_version < HW_VER_TALYN_MB) {

		wil_dbg_misc(wil, "Notify FW to set T_POWER_ON=0\n");

		wil_s(wil, RGF_USER_USAGE_8, BIT_USER_SUPPORT_T_POWER_ON_0);

	}

drivers/net/wireless/ath/wil6210/wmi.c

+3 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ MODULE_PARM_DESC(led_id, 


#define WIL_WAIT_FOR_SUSPEND_RESUME_COMP 200

#define WIL_WMI_CALL_GENERAL_TO_MS 100

#define WIL_WMI_PCP_STOP_TO_MS 5000



/**

 * WMI event receiving - theory of operations
@@ -2231,7 +2232,8 @@ int wmi_pcp_stop(struct wil6210_vif *vif) 
		return rc;



	return wmi_call(wil, WMI_PCP_STOP_CMDID, vif->mid, NULL, 0,

			WMI_PCP_STOPPED_EVENTID, NULL, 0, 20);

			WMI_PCP_STOPPED_EVENTID, NULL, 0,

			WIL_WMI_PCP_STOP_TO_MS);

}



int wmi_set_ssid(struct wil6210_vif *vif, u8 ssid_len, const void *ssid)