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_minstrel.c | |
| parent | 22f6dacdfcfdc792d068e9c41234808860498d04 (diff) | |
| parent | 9dfd6ba353b993d648dcda72480c7ce92cd27c7e (diff) | |
| download | kernel_samsung_smdk4412-a8679be2073392cf22a910bc25da0c7d36459845.zip kernel_samsung_smdk4412-a8679be2073392cf22a910bc25da0c7d36459845.tar.gz kernel_samsung_smdk4412-a8679be2073392cf22a910bc25da0c7d36459845.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/rc80211_minstrel.c')
| -rw-r--r-- | net/mac80211/rc80211_minstrel.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/mac80211/rc80211_minstrel.c b/net/mac80211/rc80211_minstrel.c index 70df3dc..efaf383 100644 --- a/net/mac80211/rc80211_minstrel.c +++ b/net/mac80211/rc80211_minstrel.c @@ -80,8 +80,7 @@ use_low_rate(struct sk_buff *skb) fc = le16_to_cpu(hdr->frame_control); return ((info->flags & IEEE80211_TX_CTL_NO_ACK) || - (fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA || - is_multicast_ether_addr(hdr->addr1)); + (fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA); } @@ -245,7 +244,10 @@ minstrel_get_rate(void *priv, struct ieee80211_sta *sta, if (!sta || !mi || use_low_rate(skb)) { ar[0].idx = rate_lowest_index(sband, sta); - ar[0].count = mp->max_retry; + if (info->flags & IEEE80211_TX_CTL_NO_ACK) + ar[0].count = 1; + else + ar[0].count = mp->max_retry; return; } |