diff options
author | David S. Miller <davem@davemloft.net> | 2008-09-19 16:17:12 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-09-19 16:17:12 -0700 |
commit | d950f264ff7260d8c1e124158d758db13e1ad2d0 (patch) | |
tree | 8a8758af70d72b94e51609a5088a5739d00d8793 /drivers/net/wireless/ath9k/rc.c | |
parent | 04da2cf9bb133355b7073be25ef3ce88c8edc135 (diff) | |
parent | 375da53b8e5e3ff2330b66b377e07a6151a93fe5 (diff) | |
download | linux-d950f264ff7260d8c1e124158d758db13e1ad2d0.tar.gz linux-d950f264ff7260d8c1e124158d758db13e1ad2d0.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/ath9k/rc.c')
-rw-r--r-- | drivers/net/wireless/ath9k/rc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath9k/rc.c b/drivers/net/wireless/ath9k/rc.c index 390019ed398e..1cc9daf44550 100644 --- a/drivers/net/wireless/ath9k/rc.c +++ b/drivers/net/wireless/ath9k/rc.c @@ -1825,7 +1825,7 @@ static void ath_setup_rates(struct ieee80211_local *local, struct sta_info *sta) sband = local->hw.wiphy->bands[local->hw.conf.channel->band]; for (i = 0; i < sband->n_bitrates; i++) { - if (sta->supp_rates[local->hw.conf.channel->band] & BIT(i)) { + if (sta->sta.supp_rates[local->hw.conf.channel->band] & BIT(i)) { rc_priv->neg_rates.rs_rates[j] = (sband->bitrates[i].bitrate * 2) / 10; j++; @@ -2039,7 +2039,6 @@ static void ath_rate_init(void *priv, void *priv_sta, DPRINTF(sc, ATH_DBG_RATE, "%s\n", __func__); sband = local->hw.wiphy->bands[local->hw.conf.channel->band]; - sta->txrate_idx = rate_lowest_index(local, sband, sta); ath_setup_rates(local, sta); if (conf->flags & IEEE80211_CONF_SUPPORT_HT_MODE) { |