diff options
| author | Thomas Pedersen <c_tpeder@qca.qualcomm.com> | 2012-06-11 13:36:12 -0700 |
|---|---|---|
| committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2012-06-14 13:54:42 +0300 |
| commit | c85251f8562095cd6fd63ae786354283c5318303 (patch) | |
| tree | c4897c388d140d9623e8bc6b1672787110ff6254 /drivers/net | |
| parent | b5b6f6a9a07ac230d54a85a9fb9e691c85f2eb0a (diff) | |
| download | blackbird-op-linux-c85251f8562095cd6fd63ae786354283c5318303.tar.gz blackbird-op-linux-c85251f8562095cd6fd63ae786354283c5318303.zip | |
ath6kl: fix fw capability parsing
This patch fixes a bug where no capabilites are parsed when the number
of firmware capability bits translate into fewer bytes than the host has
knowledge of. Instead just process number of capability bytes as
reported by the firmware.
Signed-off-by: Thomas Pedersen <c_tpeder@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/ath/ath6kl/init.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/init.c b/drivers/net/wireless/ath/ath6kl/init.c index 62e25ccd1016..f90b5db741cf 100644 --- a/drivers/net/wireless/ath/ath6kl/init.c +++ b/drivers/net/wireless/ath/ath6kl/init.c @@ -1004,9 +1004,6 @@ static int ath6kl_fetch_fw_apin(struct ath6kl *ar, const char *name) ar->hw.reserved_ram_size); break; case ATH6KL_FW_IE_CAPABILITIES: - if (ie_len < DIV_ROUND_UP(ATH6KL_FW_CAPABILITY_MAX, 8)) - break; - ath6kl_dbg(ATH6KL_DBG_BOOT, "found firmware capabilities ie (%zd B)\n", ie_len); @@ -1015,6 +1012,9 @@ static int ath6kl_fetch_fw_apin(struct ath6kl *ar, const char *name) index = i / 8; bit = i % 8; + if (index == ie_len) + break; + if (data[index] & (1 << bit)) __set_bit(i, ar->fw_capabilities); } |
