2011-08-27 08:25:38

by Felix Fietkau

Subject: [PATCH] ath9k: fix regression in sending aggregated packets

The recent commit "ath9k: Send legacy rated frames as unaggregated"
introduced a check to ensure that packets with non-MCS rates set in
the rate series will not be aggregated. However, it failed to check
if the rate series is valid before testing the flags, thus breaking
aggregation for normal MCS-only packets if the last series is unset.

Signed-off-by: Felix Fietkau <[email protected]>
---
drivers/net/wireless/ath/ath9k/xmit.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 5e29829..ac393a6 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -582,7 +582,10 @@ static bool ath_lookup_legacy(struct ath_buf *bf)
tx_info = IEEE80211_SKB_CB(skb);
rates = tx_info->control.rates;

- for (i = 3; i >= 0; i--) {
+ for (i = 0; i < 4; i++) {
+ if (!rates[i].count || rates[i].idx < 0)
+ break;
+
if (!(rates[i].flags & IEEE80211_TX_RC_MCS))
return true;
}
--
1.7.3.2

2011-08-27 08:34:53

by Rajkumar Manoharan

Subject: Re: [PATCH] ath9k: fix regression in sending aggregated packets

On Sat, Aug 27, 2011 at 10:25:27AM +0200, Felix Fietkau wrote:
> The recent commit "ath9k: Send legacy rated frames as unaggregated"
> introduced a check to ensure that packets with non-MCS rates set in
> the rate series will not be aggregated. However, it failed to check
> if the rate series is valid before testing the flags, thus breaking
> aggregation for normal MCS-only packets if the last series is unset.
>
> Signed-off-by: Felix Fietkau <[email protected]>
> ---
> drivers/net/wireless/ath/ath9k/xmit.c | 5 ++++-
> 1 files changed, 4 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
> index 5e29829..ac393a6 100644
> --- a/drivers/net/wireless/ath/ath9k/xmit.c
> +++ b/drivers/net/wireless/ath/ath9k/xmit.c
> @@ -582,7 +582,10 @@ static bool ath_lookup_legacy(struct ath_buf *bf)
> tx_info = IEEE80211_SKB_CB(skb);
> rates = tx_info->control.rates;
>
> - for (i = 3; i >= 0; i--) {
> + for (i = 0; i < 4; i++) {
> + if (!rates[i].count || rates[i].idx < 0)
> + break;
> +
Good catch. Let it be descending order that helps to reduce number of iteration in case of
ath9k_rate_control.

--
Rajkumar

2011-08-27 08:50:40

by Felix Fietkau

Subject: Re: [PATCH] ath9k: fix regression in sending aggregated packets

On 2011-08-27 10:35 AM, Rajkumar Manoharan wrote:
> On Sat, Aug 27, 2011 at 10:25:27AM +0200, Felix Fietkau wrote:
>> The recent commit "ath9k: Send legacy rated frames as unaggregated"
>> introduced a check to ensure that packets with non-MCS rates set in
>> the rate series will not be aggregated. However, it failed to check
>> if the rate series is valid before testing the flags, thus breaking
>> aggregation for normal MCS-only packets if the last series is unset.
>>
>> Signed-off-by: Felix Fietkau<[email protected]>
>> ---
>> drivers/net/wireless/ath/ath9k/xmit.c | 5 ++++-
>> 1 files changed, 4 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
>> index 5e29829..ac393a6 100644
>> --- a/drivers/net/wireless/ath/ath9k/xmit.c
>> +++ b/drivers/net/wireless/ath/ath9k/xmit.c
>> @@ -582,7 +582,10 @@ static bool ath_lookup_legacy(struct ath_buf *bf)
>> tx_info = IEEE80211_SKB_CB(skb);
>> rates = tx_info->control.rates;
>>
>> - for (i = 3; i>= 0; i--) {
>> + for (i = 0; i< 4; i++) {
>> + if (!rates[i].count || rates[i].idx< 0)
>> + break;
>> +
> Good catch. Let it be descending order that helps to reduce number of iteration in case of
> ath9k_rate_control.
That would really just be a very minor micro-optimization and it would
make finding the first invalid rate harder and the code more convoluted.
I don't think it's worth changing the patch for that.

- Felix