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

Commit 83c78da9 authored by Yogesh Ashok Powar's avatar Yogesh Ashok Powar Committed by John W. Linville
Browse files

mwifiex: add support to configure VHT for AP mode 



Currently, default VHT configuration from the firmware is used
for the VHT operations. Adding vhtcfg command to configure the
firmware based on input received from cfg.

Enable VHT for AP mode only when cfg80211_ap_settings has a
VHT IE i.e., when ieee80211ac is set to 1 in the hostapd.conf.

Signed-off-by: default avatarYogesh Ashok Powar <yogeshp@marvell.com>
Signed-off-by: default avatarAvinash Patil <patila@marvell.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 657e2765

drivers/net/wireless/mwifiex/11ac.c

+19 −0
Original line number Diff line number Diff line
@@ -259,3 +259,22 @@ int mwifiex_cmd_append_11ac_tlv(struct mwifiex_private *priv, 


	return ret_len;

}



int mwifiex_cmd_11ac_cfg(struct mwifiex_private *priv,

			 struct host_cmd_ds_command *cmd, u16 cmd_action,

			 struct mwifiex_11ac_vht_cfg *cfg)

{

	struct host_cmd_11ac_vht_cfg *vhtcfg = &cmd->params.vht_cfg;



	cmd->command = cpu_to_le16(HostCmd_CMD_11AC_CFG);

	cmd->size = cpu_to_le16(sizeof(struct host_cmd_11ac_vht_cfg) +

				S_DS_GEN);

	vhtcfg->action = cpu_to_le16(cmd_action);

	vhtcfg->band_config = cfg->band_config;

	vhtcfg->misc_config = cfg->misc_config;

	vhtcfg->cap_info = cpu_to_le32(cfg->cap_info);

	vhtcfg->mcs_tx_set = cpu_to_le32(cfg->mcs_tx_set);

	vhtcfg->mcs_rx_set = cpu_to_le32(cfg->mcs_rx_set);



	return 0;

}

drivers/net/wireless/mwifiex/11ac.h

+17 −0
Original line number Diff line number Diff line
@@ -20,7 +20,24 @@ 
#ifndef _MWIFIEX_11AC_H_

#define _MWIFIEX_11AC_H_



#define VHT_CFG_2GHZ BIT(0)

#define VHT_CFG_5GHZ BIT(1)



enum vht_cfg_misc_config {

	VHT_CAP_TX_OPERATION = 1,

	VHT_CAP_ASSOCIATION,

	VHT_CAP_UAP_ONLY

};



#define DEFAULT_VHT_MCS_SET 0xfffa

#define DISABLE_VHT_MCS_SET 0xffff



#define VHT_BW_80_160_80P80 BIT(2)



int mwifiex_cmd_append_11ac_tlv(struct mwifiex_private *priv,

				struct mwifiex_bssdescriptor *bss_desc,

				u8 **buffer);

int mwifiex_cmd_11ac_cfg(struct mwifiex_private *priv,

			 struct host_cmd_ds_command *cmd, u16 cmd_action,

			 struct mwifiex_11ac_vht_cfg *cfg);

#endif /* _MWIFIEX_11AC_H_ */

drivers/net/wireless/mwifiex/cfg80211.c

+7 −0
Original line number Diff line number Diff line
@@ -1374,6 +1374,13 @@ static int mwifiex_cfg80211_start_ap(struct wiphy *wiphy, 
	}



	mwifiex_set_ht_params(priv, bss_cfg, params);



	if (priv->adapter->is_hw_11ac_capable) {

		mwifiex_set_vht_params(priv, bss_cfg, params);

		mwifiex_set_vht_width(priv, params->chandef.width,

				      priv->ap_11ac_enabled);

	}



	mwifiex_set_wmm_params(priv, bss_cfg, params);



	if (params->inactivity_timeout > 0) {

drivers/net/wireless/mwifiex/fw.h

+11 −0
Original line number Diff line number Diff line
@@ -295,6 +295,7 @@ enum MWIFIEX_802_11_PRIVACY_FILTER { 
#define HostCmd_CMD_PCIE_DESC_DETAILS                 0x00fa

#define HostCmd_CMD_MGMT_FRAME_REG                    0x010c

#define HostCmd_CMD_REMAIN_ON_CHAN                    0x010d

#define HostCmd_CMD_11AC_CFG			      0x0112



#define PROTOCOL_NO_SECURITY        0x01

#define PROTOCOL_STATIC_WEP         0x02
@@ -1363,6 +1364,15 @@ struct host_cmd_ds_sys_config { 
	u8 tlv[0];

};



struct host_cmd_11ac_vht_cfg {

	__le16 action;

	u8 band_config;

	u8 misc_config;

	__le32 cap_info;

	__le32 mcs_tx_set;

	__le32 mcs_rx_set;

} __packed;



struct host_cmd_tlv_akmp {

	struct host_cmd_tlv tlv;

	__le16 key_mgmt;
@@ -1620,6 +1630,7 @@ struct host_cmd_ds_command { 
		struct host_cmd_ds_802_11_eeprom_access eeprom;

		struct host_cmd_ds_802_11_subsc_evt subsc_evt;

		struct host_cmd_ds_sys_config uap_sys_config;

		struct host_cmd_11ac_vht_cfg vht_cfg;

	} params;

} __packed;

drivers/net/wireless/mwifiex/ioctl.h

+8 −0
Original line number Diff line number Diff line
@@ -272,6 +272,14 @@ struct mwifiex_ds_pm_cfg { 
	} param;

};



struct mwifiex_11ac_vht_cfg {

	u8 band_config;

	u8 misc_config;

	u32 cap_info;

	u32 mcs_tx_set;

	u32 mcs_rx_set;

};



struct mwifiex_ds_11n_tx_cfg {

	u16 tx_htcap;

	u16 tx_htinfo;