diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-08 12:46:17 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-08 12:46:17 -0700 |
| commit | a8679be2073392cf22a910bc25da0c7d36459845 (patch) | |
| tree | 0d25750ea4ba3a85fe683f285261083d77080976 /net/mac80211/rc80211_pid_algo.c | |
| parent | 22f6dacdfcfdc792d068e9c41234808860498d04 (diff) | |
| parent | 9dfd6ba353b993d648dcda72480c7ce92cd27c7e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/rc80211_pid_algo.c')
| -rw-r--r-- | net/mac80211/rc80211_pid_algo.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/mac80211/rc80211_pid_algo.c b/net/mac80211/rc80211_pid_algo.c index 01d59a8e334..6704fb55c6b 100644 --- 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; - /* 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 || - is_multicast_ether_addr(hdr->addr1)) { + info->flags & IEEE80211_TX_CTL_NO_ACK) { 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; } |