aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath9k/xmit.c
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2009-09-14 00:07:07 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-10-07 16:39:29 -0400
commit43c2761364b77cd7fd20eb1f14cfee4cd1462abd (patch)
tree5f8759ab901fb94cf790805b816e7f7af53657ed /drivers/net/wireless/ath/ath9k/xmit.c
parentc46917bb53a546f60c7d3103407fe953c418dd5b (diff)
atheros: move tx/rx chainmask to ath_common
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/xmit.c')
-rw-r--r--drivers/net/wireless/ath/ath9k/xmit.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 36650505d2f..f302652af39 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -1456,6 +1456,7 @@ static u32 ath_pkt_duration(struct ath_softc *sc, u8 rix, struct ath_buf *bf,
1456 1456
1457static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf) 1457static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf)
1458{ 1458{
1459 struct ath_common *common = ath9k_hw_common(sc->sc_ah);
1459 const struct ath_rate_table *rt = sc->cur_rate_table; 1460 const struct ath_rate_table *rt = sc->cur_rate_table;
1460 struct ath9k_11n_rate_series series[4]; 1461 struct ath9k_11n_rate_series series[4];
1461 struct sk_buff *skb; 1462 struct sk_buff *skb;
@@ -1511,7 +1512,7 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf)
1511 1512
1512 rix = rates[i].idx; 1513 rix = rates[i].idx;
1513 series[i].Tries = rates[i].count; 1514 series[i].Tries = rates[i].count;
1514 series[i].ChSel = sc->tx_chainmask; 1515 series[i].ChSel = common->tx_chainmask;
1515 1516
1516 if (rates[i].flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE) 1517 if (rates[i].flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE)
1517 series[i].Rate = rt->info[rix].ratecode | 1518 series[i].Rate = rt->info[rix].ratecode |