ath9k: Fix handling of retry count of NO_ACK frames
Gábor Stefanik [Thu, 23 Apr 2009 17:36:11 +0000 (19:36 +0200)]
Check for IEEE80211_TX_CTL_NO_ACK instead of is_multicast_ether_addr
when determining whether to use lowest rate without retries.

Signed-off-by: Gábor Stefanik <netrolller.3d@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

drivers/net/wireless/ath/ath9k/rc.c

index 8f3cf10..e526dbc 100644 (file)
@@ -1568,12 +1568,13 @@ static void ath_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta,
        struct ath_rate_priv *ath_rc_priv = priv_sta;
        __le16 fc = hdr->frame_control;
 
-       /* lowest rate for management and multicast/broadcast frames */
-       if (!ieee80211_is_data(fc) || is_multicast_ether_addr(hdr->addr1) ||
-           !sta) {
+       /* lowest rate for management and NO_ACK frames */
+       if (!ieee80211_is_data(fc) ||
+           tx_info->flags & IEEE80211_TX_CTL_NO_ACK || !sta) {
                tx_info->control.rates[0].idx = rate_lowest_index(sband, sta);
                tx_info->control.rates[0].count =
-                       is_multicast_ether_addr(hdr->addr1) ? 1 : ATH_MGT_TXMAXTRY;
+                       (tx_info->flags & IEEE80211_TX_CTL_NO_ACK) ?
+                               1 : ATH_MGT_TXMAXTRY;
                return;
        }