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

Commit 8b4509f6 authored by Kevin Gan's avatar Kevin Gan Committed by John W. Linville
Browse files

mwifiex: add inactivity deauth support for ap 



The firmware has support for this feature, so we offload it to
firmware. In start_ap, driver passes the inactivity timeout
value to firmware via TLVs and firmware will report STA_DEAUTH
event to driver when inactivity timer is fired.

Signed-off-by: default avatarKevin Gan <ganhy@marvell.com>
Signed-off-by: default avatarAvinash Patil <patila@marvell.com>
Signed-off-by: default avatarNishant Sarmukadam <nishants@marvell.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3215215a

drivers/net/wireless/mwifiex/cfg80211.c

+8 −1
Original line number Diff line number Diff line
@@ -1331,6 +1331,12 @@ static int mwifiex_cfg80211_start_ap(struct wiphy *wiphy, 


	mwifiex_set_ht_params(priv, bss_cfg, params);



	if (params->inactivity_timeout > 0) {

		/* sta_ao_timer/ps_sta_ao_timer is in unit of 100ms */

		bss_cfg->sta_ao_timer = 10 * params->inactivity_timeout;

		bss_cfg->ps_sta_ao_timer = 10 * params->inactivity_timeout;

	}



	if (mwifiex_send_cmd_sync(priv, HostCmd_CMD_UAP_BSS_STOP,

				  HostCmd_ACT_GEN_SET, 0, NULL)) {

		wiphy_err(wiphy, "Failed to stop the BSS\n");
@@ -2229,7 +2235,8 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter) 
	wiphy->available_antennas_tx = BIT(adapter->number_of_antenna) - 1;

	wiphy->available_antennas_rx = BIT(adapter->number_of_antenna) - 1;



	wiphy->features = NL80211_FEATURE_HT_IBSS;

	wiphy->features = NL80211_FEATURE_HT_IBSS |

			  NL80211_FEATURE_INACTIVITY_TIMER;



	/* Reserve space for mwifiex specific private data for BSS */

	wiphy->bss_priv_size = sizeof(struct mwifiex_bss_priv);

drivers/net/wireless/mwifiex/fw.h

+7 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ enum MWIFIEX_802_11_PRIVACY_FILTER { 
#define TLV_TYPE_UAP_DTIM_PERIOD    (PROPRIETARY_TLV_BASE_ID + 45)

#define TLV_TYPE_UAP_BCAST_SSID     (PROPRIETARY_TLV_BASE_ID + 48)

#define TLV_TYPE_UAP_RTS_THRESHOLD  (PROPRIETARY_TLV_BASE_ID + 51)

#define TLV_TYPE_UAP_AO_TIMER       (PROPRIETARY_TLV_BASE_ID + 57)

#define TLV_TYPE_UAP_WEP_KEY        (PROPRIETARY_TLV_BASE_ID + 59)

#define TLV_TYPE_UAP_WPA_PASSPHRASE (PROPRIETARY_TLV_BASE_ID + 60)

#define TLV_TYPE_UAP_ENCRY_PROTOCOL (PROPRIETARY_TLV_BASE_ID + 64)
@@ -142,6 +143,7 @@ enum MWIFIEX_802_11_PRIVACY_FILTER { 
#define TLV_TYPE_MGMT_IE            (PROPRIETARY_TLV_BASE_ID + 105)

#define TLV_TYPE_AUTO_DS_PARAM      (PROPRIETARY_TLV_BASE_ID + 113)

#define TLV_TYPE_PS_PARAM           (PROPRIETARY_TLV_BASE_ID + 114)

#define TLV_TYPE_UAP_PS_AO_TIMER    (PROPRIETARY_TLV_BASE_ID + 123)

#define TLV_TYPE_PWK_CIPHER         (PROPRIETARY_TLV_BASE_ID + 145)

#define TLV_TYPE_GWK_CIPHER         (PROPRIETARY_TLV_BASE_ID + 146)
@@ -1344,6 +1346,11 @@ struct host_cmd_tlv_channel_band { 
	u8 channel;

} __packed;



struct host_cmd_tlv_ageout_timer {

	struct host_cmd_tlv tlv;

	__le32 sta_ao_timer;

} __packed;



struct host_cmd_ds_version_ext {

	u8 version_str_sel;

	char version_str[128];

drivers/net/wireless/mwifiex/ioctl.h

+2 −0
Original line number Diff line number Diff line
@@ -105,6 +105,8 @@ struct mwifiex_uap_bss_param { 
	struct wep_key wep_cfg[NUM_WEP_KEYS];

	struct ieee80211_ht_cap ht_cap;

	u8 rates[MWIFIEX_SUPPORTED_RATES];

	u32 sta_ao_timer;

	u32 ps_sta_ao_timer;

};



enum {

drivers/net/wireless/mwifiex/uap_cmd.c

+22 −0
Original line number Diff line number Diff line
@@ -343,6 +343,7 @@ mwifiex_uap_bss_param_prepare(u8 *tlv, void *cmd_buf, u16 *param_size) 
	struct host_cmd_tlv_encrypt_protocol *encrypt_protocol;

	struct host_cmd_tlv_auth_type *auth_type;

	struct host_cmd_tlv_rates *tlv_rates;

	struct host_cmd_tlv_ageout_timer *ao_timer, *ps_ao_timer;

	struct mwifiex_ie_types_htcap *htcap;

	struct mwifiex_uap_bss_param *bss_cfg = cmd_buf;

	int i;
@@ -497,6 +498,27 @@ mwifiex_uap_bss_param_prepare(u8 *tlv, void *cmd_buf, u16 *param_size) 
		tlv += sizeof(struct mwifiex_ie_types_htcap);

	}



	if (bss_cfg->sta_ao_timer) {

		ao_timer = (struct host_cmd_tlv_ageout_timer *)tlv;

		ao_timer->tlv.type = cpu_to_le16(TLV_TYPE_UAP_AO_TIMER);

		ao_timer->tlv.len = cpu_to_le16(sizeof(*ao_timer) -

						sizeof(struct host_cmd_tlv));

		ao_timer->sta_ao_timer = cpu_to_le32(bss_cfg->sta_ao_timer);

		cmd_size += sizeof(*ao_timer);

		tlv += sizeof(*ao_timer);

	}



	if (bss_cfg->ps_sta_ao_timer) {

		ps_ao_timer = (struct host_cmd_tlv_ageout_timer *)tlv;

		ps_ao_timer->tlv.type = cpu_to_le16(TLV_TYPE_UAP_PS_AO_TIMER);

		ps_ao_timer->tlv.len = cpu_to_le16(sizeof(*ps_ao_timer) -

						   sizeof(struct host_cmd_tlv));

		ps_ao_timer->sta_ao_timer =

					cpu_to_le32(bss_cfg->ps_sta_ao_timer);

		cmd_size += sizeof(*ps_ao_timer);

		tlv += sizeof(*ps_ao_timer);

	}



	*param_size = cmd_size;



	return 0;