diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-09-10 18:01:57 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-09-15 16:48:22 -0400 |
commit | 96dd22ac06b0dbfb069fdf530c72046a941e9694 (patch) | |
tree | 4dbf19921a1d4add0ca03a0ff1d7db37c4ecb8be /net/mac80211/tx.c | |
parent | ccd7b36286f8c42b3fa95c5a8d402162ffab41df (diff) |
mac80211: inform driver of basic rateset
Drivers need to know the basic rateset to be able to configure
the ACK/CTS programming in hardware correctly.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/tx.c')
-rw-r--r-- | net/mac80211/tx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 1bed3be01c26..a523189f10c4 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c | |||
@@ -153,7 +153,7 @@ static __le16 ieee80211_duration(struct ieee80211_tx_data *tx, int group_addr, | |||
153 | if (r->bitrate > txrate->bitrate) | 153 | if (r->bitrate > txrate->bitrate) |
154 | break; | 154 | break; |
155 | 155 | ||
156 | if (tx->sdata->basic_rates & BIT(i)) | 156 | if (tx->sdata->bss_conf.basic_rates & BIT(i)) |
157 | rate = r->bitrate; | 157 | rate = r->bitrate; |
158 | 158 | ||
159 | switch (sband->band) { | 159 | switch (sband->band) { |
@@ -594,7 +594,7 @@ ieee80211_tx_h_misc(struct ieee80211_tx_data *tx) | |||
594 | for (idx = 0; idx < sband->n_bitrates; idx++) { | 594 | for (idx = 0; idx < sband->n_bitrates; idx++) { |
595 | if (sband->bitrates[idx].bitrate > rate->bitrate) | 595 | if (sband->bitrates[idx].bitrate > rate->bitrate) |
596 | continue; | 596 | continue; |
597 | if (tx->sdata->basic_rates & BIT(idx) && | 597 | if (tx->sdata->bss_conf.basic_rates & BIT(idx) && |
598 | (baserate < 0 || | 598 | (baserate < 0 || |
599 | (sband->bitrates[baserate].bitrate | 599 | (sband->bitrates[baserate].bitrate |
600 | < sband->bitrates[idx].bitrate))) | 600 | < sband->bitrates[idx].bitrate))) |