Skip to content

Commit

Permalink
ath6kl: Find ar->max_norm_iface in firmware IE parsing
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Vasanthakumar Thiagarajan authored and Kalle Valo committed Nov 21, 2011
1 parent 774439a commit f143379
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
6 changes: 0 additions & 6 deletions drivers/net/wireless/ath/ath6kl/cfg80211.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 3 additions & 0 deletions drivers/net/wireless/ath/ath6kl/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit f143379

Please sign in to comment.