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

Commit 7ac25eac authored by Mohammed Shafi Shajakhan's avatar Mohammed Shafi Shajakhan Committed by Kalle Valo
Browse files

ath6kl: Fix inactivity timeout for AR6004 



Currently AR6004 handles the inactivity timeout resolution
in minutes rather than seconds. So parse the inactivity timeout
to the firmware in minutes. For now we will cleanup the
inactive station entries to the nearest converted minutes
(ex:  an inactive time of 70 seconds would take atleast 2 - 3 minutes)
Tested with surprise removal of client cards/host shutdown.

Cc: Manikandan Radhakrishnan <mradhakr@qca.qualcomm.com>
Reported-by: default avatarLeela Kella <leela@qca.qualcomm.com>
Signed-off-by: default avatarMohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent c0b34e2b

drivers/net/wireless/ath/ath6kl/cfg80211.c

+9 −1
Original line number Diff line number Diff line
@@ -2760,6 +2760,7 @@ static int ath6kl_start_ap(struct wiphy *wiphy, struct net_device *dev, 
	int res;

	int i, ret;

	u16 rsn_capab = 0;

	int inactivity_timeout = 0;



	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s:\n", __func__);
@@ -2896,8 +2897,15 @@ static int ath6kl_start_ap(struct wiphy *wiphy, struct net_device *dev, 
	}



	if (info->inactivity_timeout) {



		inactivity_timeout = info->inactivity_timeout;



		if (ar->hw.flags & ATH6KL_HW_AP_INACTIVITY_MINS)

			inactivity_timeout = DIV_ROUND_UP(inactivity_timeout,

							  60);



		res = ath6kl_wmi_set_inact_period(ar->wmi, vif->fw_vif_idx,

						  info->inactivity_timeout);

						  inactivity_timeout);

		if (res < 0)

			return res;

	}

drivers/net/wireless/ath/ath6kl/core.h

+2 −1
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ struct ath6kl_fw_ie { 


enum ath6kl_hw_flags {

	ATH6KL_HW_64BIT_RATES		= BIT(0),

	ATH6KL_HW_AP_INACTIVITY_MINS	= BIT(1),

};



#define ATH6KL_FW_API2_FILE "fw-2.bin"

drivers/net/wireless/ath/ath6kl/init.c

+8 −5
Original line number Diff line number Diff line
@@ -93,7 +93,8 @@ static const struct ath6kl_hw hw_list[] = { 
		.board_addr			= 0x433900,

		.refclk_hz			= 26000000,

		.uarttx_pin			= 11,

		.flags				= ATH6KL_HW_64BIT_RATES,

		.flags				= ATH6KL_HW_64BIT_RATES |

						  ATH6KL_HW_AP_INACTIVITY_MINS,



		.fw = {

			.dir		= AR6004_HW_1_0_FW_DIR,
@@ -113,8 +114,8 @@ static const struct ath6kl_hw hw_list[] = { 
		.board_addr			= 0x43d400,

		.refclk_hz			= 40000000,

		.uarttx_pin			= 11,

		.flags				= ATH6KL_HW_64BIT_RATES,



		.flags				= ATH6KL_HW_64BIT_RATES |

						  ATH6KL_HW_AP_INACTIVITY_MINS,

		.fw = {

			.dir		= AR6004_HW_1_1_FW_DIR,

			.fw		= AR6004_HW_1_1_FIRMWARE_FILE,
@@ -133,7 +134,8 @@ static const struct ath6kl_hw hw_list[] = { 
		.board_addr			= 0x435c00,

		.refclk_hz			= 40000000,

		.uarttx_pin			= 11,

		.flags				= ATH6KL_HW_64BIT_RATES,

		.flags				= ATH6KL_HW_64BIT_RATES |

						  ATH6KL_HW_AP_INACTIVITY_MINS,



		.fw = {

			.dir		= AR6004_HW_1_2_FW_DIR,
@@ -152,7 +154,8 @@ static const struct ath6kl_hw hw_list[] = { 
		.board_addr			= 0x436400,

		.refclk_hz                      = 40000000,

		.uarttx_pin                     = 11,

		.flags                          = ATH6KL_HW_64BIT_RATES,

		.flags				= ATH6KL_HW_64BIT_RATES |

						  ATH6KL_HW_AP_INACTIVITY_MINS,



		.fw = {

			.dir            = AR6004_HW_1_3_FW_DIR,