diff options
| author | Gábor Stefanik <netrolller.3d@gmail.com> | 2009-04-23 22:06:06 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-05-06 23:14:50 +0400 |
| commit | 922368414e5700d1ed51510e54137359297d78e7 (patch) | |
| tree | b38f48350c3b45de0fc1e6a876cab99663ba8c12 /net/mac80211 | |
| parent | 4edf040afc9237aa8cc90bcf54b521ac47d1ed78 (diff) | |
| download | linux-922368414e5700d1ed51510e54137359297d78e7.tar.xz | |
mac80211: Fix handling of retry count of NO_ACK frames in PID
Make PID check for IEEE80211_TX_CTL_NO_ACK instead of
is_multicast_ether_addr when determining whether to use the lowest
rate, and set the retry count to 0 (total try count = 1) if
IEEE80211_TX_CTL_NO_ACK is set.
Signed-off-by: Gábor Stefanik <netrolller.3d@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
| -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 b16801cde06f..2b33e3a7ee7d 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; } |