lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mac80211: Fix handling of retry count of NO_ACK frames in minstrel

Browse Source 
Make the retry count zero (total try count = 1) for frames with
IEEE80211_TX_CTL_NO_ACK set.

Also remove the check for is_multicast_ether_addr in use_low_rate,
which is redundant because all multicasts have IEEE80211_TX_CTL_NO_ACK
set.

Signed-off-by: Gábor Stefanik <netrolller.3d@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Gábor Stefanik
2009-04-23 19:36:00 +02:00
committed by John W. Linville
parent 2516baa63b
commit 4edf040afc
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/mac80211/rc80211_minstrel.c
View File

@@ -80,8 +80,7 @@ use_low_rate(struct sk_buff *skb)
fc = le16_to_cpu(hdr->frame_control); fc = le16_to_cpu(hdr->frame_control);
return ((info->flags & IEEE80211_TX_CTL_NO_ACK) || return ((info->flags & IEEE80211_TX_CTL_NO_ACK) ||
(fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA || (fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA);
is_multicast_ether_addr(hdr->addr1));
} }
@@ -245,6 +244,9 @@ minstrel_get_rate(void *priv, struct ieee80211_sta *sta,
if (!sta || !mi || use_low_rate(skb)) { if (!sta || !mi || use_low_rate(skb)) {
ar[0].idx = rate_lowest_index(sband, sta); ar[0].idx = rate_lowest_index(sband, sta);
if (info->flags & IEEE80211_TX_CTL_NO_ACK)
ar[0].count = 1;
else
ar[0].count = mp->max_retry; ar[0].count = mp->max_retry;
return; return;
} }