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

Commit b64de356 authored by Vasanthakumar Thiagarajan's avatar Vasanthakumar Thiagarajan Committed by Kalle Valo
Browse files

ath6kl: Enable multiple vif support 



The maximum number of supported virtual interfaces are 3.

Signed-off-by: default avatarVasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent f143379d

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

+1 −1
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ enum ath6kl_hif_type { 
 * Driver's maximum limit, note that some firmwares support only one vif

 * and the runtime (current) limit must be checked from ar->vif_max.

 */

#define ATH6KL_VIF_MAX	1

#define ATH6KL_VIF_MAX	3



/* vif flags info */

enum ath6kl_vif_state {

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

+3 −15
Original line number Diff line number Diff line
@@ -414,11 +414,7 @@ static int ath6kl_target_config_wlan_params(struct ath6kl *ar, int idx) 
			status = -EIO;

		}



	/*

	 * FIXME: Make sure p2p configurations are not applied to

	 * non-p2p capable interfaces when multivif support is enabled.

	 */

	if (ar->p2p) {

	if (ar->p2p && (ar->vif_max == 1 || idx)) {

		ret = ath6kl_wmi_info_req_cmd(ar->wmi, idx,

					      P2P_FLAG_CAPABILITIES_REQ |

					      P2P_FLAG_MACADDR_REQ |
@@ -431,11 +427,7 @@ static int ath6kl_target_config_wlan_params(struct ath6kl *ar, int idx) 
		}

	}



	/*

	 * FIXME: Make sure p2p configurations are not applied to

	 * non-p2p capable interfaces when multivif support is enabled.

	 */

	if (ar->p2p) {

	if (ar->p2p && (ar->vif_max == 1 || idx)) {

		/* Enable Probe Request reporting for P2P */

		ret = ath6kl_wmi_probe_report_req_cmd(ar->wmi, idx, true);

		if (ret) {
@@ -481,11 +473,7 @@ int ath6kl_configure_target(struct ath6kl *ar) 
		fw_submode |= HI_OPTION_FW_SUBMODE_P2PDEV <<

			      (i * HI_OPTION_FW_SUBMODE_BITS);



	/*

	 * FIXME: This needs to be removed once the multivif

	 * support is enabled.

	 */

	if (ar->p2p)

	if (ar->p2p && ar->vif_max == 1)

		fw_submode = HI_OPTION_FW_SUBMODE_P2PDEV;



	param = HTC_PROTOCOL_VERSION;