git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mac80211: Fix handling of retry count of NO_ACK frames in PID
[pandora-kernel.git]
/
net
/
mac80211
/
rc80211_pid_algo.c
diff --git
a/net/mac80211/rc80211_pid_algo.c
b/net/mac80211/rc80211_pid_algo.c
index
b16801c
..
2b33e3a
100644
(file)
--- a/
net/mac80211/rc80211_pid_algo.c
+++ b/
net/mac80211/rc80211_pid_algo.c
@@
-289,13
+289,15
@@
rate_control_pid_get_rate(void *priv, struct ieee80211_sta *sta,
info->control.rates[0].count =
txrc->hw->conf.short_frame_max_tx_count;
info->control.rates[0].count =
txrc->hw->conf.short_frame_max_tx_count;
- /* Send management frames and broadcast/multicast data using lowest
- * rate. */
+ /* Send management frames and NO_ACK data using lowest rate. */
fc = le16_to_cpu(hdr->frame_control);
if (!sta || !spinfo ||
(fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA ||
fc = le16_to_cpu(hdr->frame_control);
if (!sta || !spinfo ||
(fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA ||
- i
s_multicast_ether_addr(hdr->addr1)
) {
+ i
nfo->flags & IEEE80211_TX_CTL_NO_ACK
) {
info->control.rates[0].idx = rate_lowest_index(sband, sta);
info->control.rates[0].idx = rate_lowest_index(sband, sta);
+ if (info->flags & IEEE80211_TX_CTL_NO_ACK)
+ info->control.rates[0].count = 1;
+
return;
}
return;
}