mirror of https://gitee.com/openkylin/linux.git
ath6kl: Find ar->max_norm_iface in firmware IE parsing
Currently the max number of vifs which can be used for non-p2p mode is determined in ath6kl_core_alloc(). But the maximum supported vifs are parsed from firmware IE in ath6kl_fetch_fw_api2() which would happen after ath6kl_core_alloc(). Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
This commit is contained in:
parent
774439ad88
commit
f143379dbf
|
@ -2456,12 +2456,6 @@ struct ath6kl *ath6kl_core_alloc(struct device *dev)
|
|||
|
||||
ar->vif_max = 1;
|
||||
|
||||
if (!ar->p2p)
|
||||
ar->max_norm_iface = 2;
|
||||
else
|
||||
ar->max_norm_iface = 1;
|
||||
|
||||
/* FIXME: Remove this once the multivif support is enabled */
|
||||
ar->max_norm_iface = 1;
|
||||
|
||||
spin_lock_init(&ar->lock);
|
||||
|
|
|
@ -971,6 +971,9 @@ static int ath6kl_fetch_fw_api2(struct ath6kl *ar)
|
|||
ar->vif_max = min_t(unsigned int, le32_to_cpup(val),
|
||||
ATH6KL_VIF_MAX);
|
||||
|
||||
if (ar->vif_max > 1 && !ar->p2p)
|
||||
ar->max_norm_iface = 2;
|
||||
|
||||
ath6kl_dbg(ATH6KL_DBG_BOOT,
|
||||
"found vif max ie %d\n", ar->vif_max);
|
||||
break;
|
||||
|
|
Loading…
Reference in New Issue