2014-02-10 12:13:26

by Bartosz Markowski

Subject: [PATCH] ath10k: AP: handle HT station which does not have HT RX MCS

This is a workaround for HT-enabled STAs which break the spec
and have no HT capabilities RX mask (no HT RX MCS map).

As per spec, in section 20.3.5 Modulation and coding scheme (MCS),
MCS 0 through 7 are mandatory in 20MHz with 800 ns GI at all STAs.

Firmware asserts if such situation occurs.

Signed-off-by: Bartosz Markowski <[email protected]>
---
drivers/net/wireless/ath/ath10k/mac.c | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 144b4d6..162920a 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -1148,8 +1148,23 @@ static void ath10k_peer_assoc_h_ht(struct ath10k *ar,
if (ht_cap->mcs.rx_mask[i/8] & (1 << i%8))
arg->peer_ht_rates.rates[n++] = i;

- arg->peer_ht_rates.num_rates = n;
- arg->peer_num_spatial_streams = max((n+7) / 8, 1);
+ /*
+ * This is a workaround for HT-enabled STAs which break the spec
+ * and have no HT capabilities RX mask (no HT RX MCS map).
+ *
+ * As per spec, in section 20.3.5 Modulation and coding scheme (MCS),
+ * MCS 0 through 7 are mandatory in 20MHz with 800 ns GI at all STAs.
+ *
+ * Firmware asserts if such situation occurs.
+ */
+ if (n == 0) {
+ arg->peer_ht_rates.num_rates = 8;
+ for (i = 0; i < arg->peer_ht_rates.num_rates; i++)
+ arg->peer_ht_rates.rates[i] = i;
+ } else {
+ arg->peer_ht_rates.num_rates = n;
+ arg->peer_num_spatial_streams = max((n+7) / 8, 1);
+ }

ath10k_dbg(ATH10K_DBG_MAC, "mac ht peer %pM mcs cnt %d nss %d\n",
arg->addr,
--
1.7.9.5

2014-02-11 08:07:04

by Kalle Valo

Subject: Re: [PATCH] ath10k: AP: handle HT station which does not have HT RX MCS

Bartosz Markowski <[email protected]> writes:

> This is a workaround for HT-enabled STAs which break the spec
> and have no HT capabilities RX mask (no HT RX MCS map).
>
> As per spec, in section 20.3.5 Modulation and coding scheme (MCS),
> MCS 0 through 7 are mandatory in 20MHz with 800 ns GI at all STAs.
>
> Firmware asserts if such situation occurs.
>
> Signed-off-by: Bartosz Markowski <[email protected]>

This conflicted with Marek K's patch "ath10k: Set proper nss value for
the peer". Please check that my resolution in ath-next-test is correct:

https://github.com/kvalo/ath/commit/d56aa0e779c17f8048a70a9dbd5228b54d9a712e

--
Kalle Valo

2014-02-11 08:10:58

by Bartosz Markowski

Subject: Re: [PATCH] ath10k: AP: handle HT station which does not have HT RX MCS

On 11 February 2014 09:06, Kalle Valo <[email protected]> wrote:
> Bartosz Markowski <[email protected]> writes:
>
>> This is a workaround for HT-enabled STAs which break the spec
>> and have no HT capabilities RX mask (no HT RX MCS map).
>>
>> As per spec, in section 20.3.5 Modulation and coding scheme (MCS),
>> MCS 0 through 7 are mandatory in 20MHz with 800 ns GI at all STAs.
>>
>> Firmware asserts if such situation occurs.
>>
>> Signed-off-by: Bartosz Markowski <[email protected]>
>
> This conflicted with Marek K's patch "ath10k: Set proper nss value for
> the peer". Please check that my resolution in ath-next-test is correct:
>
> https://github.com/kvalo/ath/commit/d56aa0e779c17f8048a70a9dbd5228b54d9a712e

Looks good.

--
Bartosz

2014-02-13 15:47:02

by Kalle Valo

Subject: Re: [PATCH] ath10k: AP: handle HT station which does not have HT RX MCS

Bartosz Markowski <[email protected]> writes:

> On 11 February 2014 09:06, Kalle Valo <[email protected]> wrote:
>> Bartosz Markowski <[email protected]> writes:
>>
>>> This is a workaround for HT-enabled STAs which break the spec
>>> and have no HT capabilities RX mask (no HT RX MCS map).
>>>
>>> As per spec, in section 20.3.5 Modulation and coding scheme (MCS),
>>> MCS 0 through 7 are mandatory in 20MHz with 800 ns GI at all STAs.
>>>
>>> Firmware asserts if such situation occurs.
>>>
>>> Signed-off-by: Bartosz Markowski <[email protected]>
>>
>> This conflicted with Marek K's patch "ath10k: Set proper nss value for
>> the peer". Please check that my resolution in ath-next-test is correct:
>>
>> https://github.com/kvalo/ath/commit/d56aa0e779c17f8048a70a9dbd5228b54d9a712e
>
> Looks good.

Thanks, applied.

--
Kalle Valo