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

[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()" ?

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.

     Signed-off-by: Michal Kazior <michal.kazior at tieto.com>
     Signed-off-by: Kalle Valo <kvalo at qca.qualcomm.com>

-------------------- 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;
  }


-- 
Ben Greear <greearb at candelatech.com>
Candela Technologies Inc  http://www.candelatech.com