diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-10 09:50:47 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-10 09:50:47 -0800 |
| commit | 1e13f863ca88014d9550876c05c939fdab1017d1 (patch) | |
| tree | 1ede9804ee33d7eefb73e9535e0399dfd7f58c00 /drivers/net/wireless/ath/ath9k/beacon.c | |
| parent | f404c2fea37e02bec7c8b6edddf5edd22ca60505 (diff) | |
| parent | f435d9eea01309aa7b6c1f134569a7b5957918ae (diff) | |
| download | talos-op-linux-1e13f863ca88014d9550876c05c939fdab1017d1.tar.gz talos-op-linux-1e13f863ca88014d9550876c05c939fdab1017d1.zip | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/beacon.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/beacon.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c index 30724a4e8bb2..47bedd82e9a9 100644 --- a/drivers/net/wireless/ath/ath9k/beacon.c +++ b/drivers/net/wireless/ath/ath9k/beacon.c @@ -103,7 +103,8 @@ static void ath_beacon_setup(struct ath_softc *sc, struct ath_vif *avp, memset(series, 0, sizeof(struct ath9k_11n_rate_series) * 4); series[0].Tries = 1; series[0].Rate = rate; - series[0].ChSel = common->tx_chainmask; + series[0].ChSel = ath_txchainmask_reduction(sc, + common->tx_chainmask, series[0].Rate); series[0].RateFlags = (ctsrate) ? ATH9K_RATESERIES_RTS_CTS : 0; ath9k_hw_set11n_ratescenario(ah, ds, ds, 0, ctsrate, ctsduration, series, 4, 0); |
