Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-25 20:32:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

ath6kl: add firmware IE for maximum number of vifs

Browse Source 
Not all firmwares support multiple vifs and we need to read the limit from
the firmware image.

Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
This commit is contained in:
Kalle Valo 2011-11-14 19:31:38 +02:00
parent 71f96ee6c6
commit 368b1b0f4b
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/wireless/ath/ath6kl/core.h
View File

@ -71,6 +71,7 @@ enum ath6kl_fw_ie_type {
ATH6KL_FW_IE_CAPABILITIES = 6, ATH6KL_FW_IE_CAPABILITIES = 6,
ATH6KL_FW_IE_PATCH_ADDR = 7, ATH6KL_FW_IE_PATCH_ADDR = 7,
ATH6KL_FW_IE_BOARD_ADDR = 8, ATH6KL_FW_IE_BOARD_ADDR = 8,
ATH6KL_FW_IE_VIF_MAX = 9,
}; };
enum ath6kl_fw_capability { enum ath6kl_fw_capability {
@ -502,7 +503,7 @@ struct ath6kl {
/* Lock to avoid race in vif_list entries among add/del/traverse */ /* Lock to avoid race in vif_list entries among add/del/traverse */
spinlock_t list_lock; spinlock_t list_lock;
u8 num_vif; u8 num_vif;
int vif_max; unsigned int vif_max;
u8 max_norm_iface; u8 max_norm_iface;
u8 avail_idx_map; u8 avail_idx_map;
spinlock_t lock; spinlock_t lock;

11
drivers/net/wireless/ath/ath6kl/init.c
View File

@ -963,6 +963,17 @@ static int ath6kl_fetch_fw_api2(struct ath6kl *ar)
"found board address ie 0x%x\n", "found board address ie 0x%x\n",
ar->hw.board_addr); ar->hw.board_addr);
break; break;
case ATH6KL_FW_IE_VIF_MAX:
if (ie_len != sizeof(*val))
break;
val = (__le32 *) data;
ar->vif_max = min_t(unsigned int, le32_to_cpup(val),
ATH6KL_VIF_MAX);
ath6kl_dbg(ATH6KL_DBG_BOOT,
"found vif max ie %d\n", ar->vif_max);
break;
default: default:
ath6kl_dbg(ATH6KL_DBG_BOOT, "Unknown fw ie: %u\n", ath6kl_dbg(ATH6KL_DBG_BOOT, "Unknown fw ie: %u\n",
le32_to_cpup(&hdr->id)); le32_to_cpup(&hdr->id));