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

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

Browse Source
This commit is contained in:
David S. Miller
2009-05-08 12:46:17 -07:00
parent 22f6dacdfc 9dfd6ba353
commit a8679be207
125 changed files with 17193 additions and 1896 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
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);
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;
}