Skip to contentSkip to conversation

Question on "ath10k: document ofdm/5ghz rate offset with a macro"

DISCUSSION Ben Greear 2 participants 5 messages Jun 6, 2016 – Jun 7, 2016 Qualcomm Atheros ATH10K wireless driver

lore
Share & tools
lore

Ben Greear

author
#0 lore raw

While porting some patches forward, I notice the change below that renamed the method to "ath10k_mac_sta_has_ofdm_only". But, that is not really what that is checking, since it just throws away the CCK rates (and they might have been there).

Maybe it should just be "ath10k_mac_sta_has_ofdm()" ?

Thanks,
Ben

ath10k: document ofdm/5ghz rate offset with a macro

Don't use literal values for offsets. While at it rename a function so it is more clear what it checks for.

This finally takes care of the last magic
5GHz/OFDM offset.

-------------------- drivers/net/wireless/ath/ath10k/mac.c -------------------- index e62b587..ec26d96 100644
@@ -61,8 +61,11 @@ static struct ieee80211_rate ath10k_rates[] = {
{ .bitrate = 540, .hw_value = ATH10K_HW_RATE_OFDM_54M },
};

-#define ath10k_a_rates (ath10k_rates + 4)
-#define ath10k_a_rates_size (ARRAY_SIZE(ath10k_rates) - 4) +#define ATH10K_MAC_FIRST_OFDM_RATE_IDX 4
+
+#define ath10k_a_rates (ath10k_rates + ATH10K_MAC_FIRST_OFDM_RATE_IDX) +#define ath10k_a_rates_size (ARRAY_SIZE(ath10k_rates) - \
+ ATH10K_MAC_FIRST_OFDM_RATE_IDX)
#define ath10k_g_rates (ath10k_rates + 0)
#define ath10k_g_rates_size (ARRAY_SIZE(ath10k_rates))

@@ -2038,10 +2041,10 @@ static void ath10k_peer_assoc_h_qos(struct ath10k *ar,
sta->addr, !!(arg->peer_flags & WMI_PEER_QOS));
}

-static bool ath10k_mac_sta_has_11g_rates(struct ieee80211_sta *sta) +static bool ath10k_mac_sta_has_ofdm_only(struct ieee80211_sta *sta)
{
- /* First 4 rates in ath10k_rates are CCK (11b) rates. */
- return sta->supp_rates[IEEE80211_BAND_2GHZ] >> 4;
+ return sta->supp_rates[IEEE80211_BAND_2GHZ] >>
+ ATH10K_MAC_FIRST_OFDM_RATE_IDX;
}

Signature · 8 lines
Ben Greear <[email protected]>
Candela Technologies Inc  http://www.candelatech.com


_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k
#1 lore raw
Quoted 6 lines · Ben Greear

While porting some patches forward, I notice the change below that renamed the method to "ath10k_mac_sta_has_ofdm_only". But, that is not really what that is checking, since it just throws away the CCK rates (and they might have been there).

Maybe it should just be "ath10k_mac_sta_has_ofdm()" ?

Yes, this seems like an unfortunate name pick on my side. The MODE_11G phymode is for mixed b/g.

Michał

_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k

author
#2 lore raw
Quoted 10 lines · Michal Kazior
Quoted 6 lines · Ben Greear

While porting some patches forward, I notice the change below that renamed the method to "ath10k_mac_sta_has_ofdm_only". But, that is not really what that is checking, since it just throws away the CCK rates (and they might have been there).

Maybe it should just be "ath10k_mac_sta_has_ofdm()" ?

Yes, this seems like an unfortunate name pick on my side. The MODE_11G phymode is for mixed b/g.

I think the actual code behaviour is right. I have some patches to support G-only mode and such, and will change the name of your method in those patches to be more clear.

Lots of other pending patches of mine before I will get to trying to push that one upstream though.

Thanks,
Ben

Signature · 7 lines
Ben Greear <[email protected]>
Candela Technologies Inc  http://www.candelatech.com

_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k
#3 lore raw
Quoted 13 lines · Ben Greear
Quoted 11 lines · Michal Kazior
Quoted 7 lines · Ben Greear

While porting some patches forward, I notice the change below that renamed the method to "ath10k_mac_sta_has_ofdm_only". But, that is not really what that is checking, since it just throws away the CCK rates (and they might have been there).

Maybe it should just be "ath10k_mac_sta_has_ofdm()" ?

Yes, this seems like an unfortunate name pick on my side. The MODE_11G phymode is for mixed b/g.

Quoted 6 lines

I think the actual code behaviour is right. I have some patches to support G-only mode and such, and will change the name of your method in those patches to be more clear.

Lots of other pending patches of mine before I will get to trying to push that one upstream though.

Hmm.. I do recall 11G_ONLY phymode didn't play out well with 11B coexistance in AP mode. I can't remember the details though..

Michał

_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k

author
#4 lore raw
Quoted 18 lines · Michal Kazior
Quoted 17 lines · Ben Greear
Quoted 11 lines · Michal Kazior
Quoted 7 lines · Ben Greear

While porting some patches forward, I notice the change below that renamed the method to "ath10k_mac_sta_has_ofdm_only". But, that is not really what that is checking, since it just throws away the CCK rates (and they might have been there).

Maybe it should just be "ath10k_mac_sta_has_ofdm()" ?

Yes, this seems like an unfortunate name pick on my side. The MODE_11G phymode is for mixed b/g.

I think the actual code behaviour is right. I have some patches to support G-only mode and such, and will change the name of your method in those patches to be more clear.

Quoted 5 lines
Quoted 2 lines

Lots of other pending patches of mine before I will get to trying to push that one upstream though.

Hmm.. I do recall 11G_ONLY phymode didn't play out well with 11B coexistance in AP mode. I can't remember the details though..

If you remember a test case for this, let me know.

Thanks,
Ben

Signature · 7 lines
Ben Greear <[email protected]>
Candela Technologies Inc  http://www.candelatech.com

_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k