forked from Minki/linux
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>
This commit is contained in:
parent
c46917bb53
commit
43c2761364
@ -56,6 +56,9 @@ struct ath_common {
|
|||||||
u8 curbssid[ETH_ALEN];
|
u8 curbssid[ETH_ALEN];
|
||||||
u8 bssidmask[ETH_ALEN];
|
u8 bssidmask[ETH_ALEN];
|
||||||
|
|
||||||
|
u8 tx_chainmask;
|
||||||
|
u8 rx_chainmask;
|
||||||
|
|
||||||
struct ath_regulatory regulatory;
|
struct ath_regulatory regulatory;
|
||||||
const struct ath_ops *ops;
|
const struct ath_ops *ops;
|
||||||
};
|
};
|
||||||
|
@ -586,8 +586,6 @@ struct ath_softc {
|
|||||||
u16 curtxpow;
|
u16 curtxpow;
|
||||||
u8 nbcnvifs;
|
u8 nbcnvifs;
|
||||||
u16 nvifs;
|
u16 nvifs;
|
||||||
u8 tx_chainmask;
|
|
||||||
u8 rx_chainmask;
|
|
||||||
u32 keymax;
|
u32 keymax;
|
||||||
DECLARE_BITMAP(keymap, ATH_KEYMAX);
|
DECLARE_BITMAP(keymap, ATH_KEYMAX);
|
||||||
u8 splitmic;
|
u8 splitmic;
|
||||||
|
@ -62,6 +62,7 @@ static void ath_beacon_setup(struct ath_softc *sc, struct ath_vif *avp,
|
|||||||
{
|
{
|
||||||
struct sk_buff *skb = bf->bf_mpdu;
|
struct sk_buff *skb = bf->bf_mpdu;
|
||||||
struct ath_hw *ah = sc->sc_ah;
|
struct ath_hw *ah = sc->sc_ah;
|
||||||
|
struct ath_common *common = ath9k_hw_common(ah);
|
||||||
struct ath_desc *ds;
|
struct ath_desc *ds;
|
||||||
struct ath9k_11n_rate_series series[4];
|
struct ath9k_11n_rate_series series[4];
|
||||||
const struct ath_rate_table *rt;
|
const struct ath_rate_table *rt;
|
||||||
@ -109,7 +110,7 @@ static void ath_beacon_setup(struct ath_softc *sc, struct ath_vif *avp,
|
|||||||
memset(series, 0, sizeof(struct ath9k_11n_rate_series) * 4);
|
memset(series, 0, sizeof(struct ath9k_11n_rate_series) * 4);
|
||||||
series[0].Tries = 1;
|
series[0].Tries = 1;
|
||||||
series[0].Rate = rate;
|
series[0].Rate = rate;
|
||||||
series[0].ChSel = sc->tx_chainmask;
|
series[0].ChSel = common->tx_chainmask;
|
||||||
series[0].RateFlags = (ctsrate) ? ATH9K_RATESERIES_RTS_CTS : 0;
|
series[0].RateFlags = (ctsrate) ? ATH9K_RATESERIES_RTS_CTS : 0;
|
||||||
ath9k_hw_set11n_ratescenario(ah, ds, ds, 0, ctsrate, ctsduration,
|
ath9k_hw_set11n_ratescenario(ah, ds, ds, 0, ctsrate, ctsduration,
|
||||||
series, 4, 0);
|
series, 4, 0);
|
||||||
|
@ -2334,8 +2334,8 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
|
|||||||
int i, rx_chainmask, r;
|
int i, rx_chainmask, r;
|
||||||
|
|
||||||
ah->extprotspacing = sc->ht_extprotspacing;
|
ah->extprotspacing = sc->ht_extprotspacing;
|
||||||
ah->txchainmask = sc->tx_chainmask;
|
ah->txchainmask = common->tx_chainmask;
|
||||||
ah->rxchainmask = sc->rx_chainmask;
|
ah->rxchainmask = common->rx_chainmask;
|
||||||
|
|
||||||
if (!ath9k_hw_setpower(ah, ATH9K_PM_AWAKE))
|
if (!ath9k_hw_setpower(ah, ATH9K_PM_AWAKE))
|
||||||
return -EIO;
|
return -EIO;
|
||||||
|
@ -438,8 +438,11 @@ static void ath_ani_calibrate(unsigned long data)
|
|||||||
|
|
||||||
/* Perform calibration if necessary */
|
/* Perform calibration if necessary */
|
||||||
if (longcal || shortcal) {
|
if (longcal || shortcal) {
|
||||||
sc->ani.caldone = ath9k_hw_calibrate(ah, ah->curchan,
|
sc->ani.caldone =
|
||||||
sc->rx_chainmask, longcal);
|
ath9k_hw_calibrate(ah,
|
||||||
|
ah->curchan,
|
||||||
|
common->rx_chainmask,
|
||||||
|
longcal);
|
||||||
|
|
||||||
if (longcal)
|
if (longcal)
|
||||||
sc->ani.noise_floor = ath9k_hw_getchan_noise(ah,
|
sc->ani.noise_floor = ath9k_hw_getchan_noise(ah,
|
||||||
@ -492,19 +495,21 @@ static void ath_start_ani(struct ath_softc *sc)
|
|||||||
void ath_update_chainmask(struct ath_softc *sc, int is_ht)
|
void ath_update_chainmask(struct ath_softc *sc, int is_ht)
|
||||||
{
|
{
|
||||||
struct ath_hw *ah = sc->sc_ah;
|
struct ath_hw *ah = sc->sc_ah;
|
||||||
|
struct ath_common *common = ath9k_hw_common(ah);
|
||||||
|
|
||||||
if ((sc->sc_flags & SC_OP_SCANNING) || is_ht ||
|
if ((sc->sc_flags & SC_OP_SCANNING) || is_ht ||
|
||||||
(ah->btcoex_hw.scheme != ATH_BTCOEX_CFG_NONE)) {
|
(ah->btcoex_hw.scheme != ATH_BTCOEX_CFG_NONE)) {
|
||||||
sc->tx_chainmask = sc->sc_ah->caps.tx_chainmask;
|
common->tx_chainmask = ah->caps.tx_chainmask;
|
||||||
sc->rx_chainmask = sc->sc_ah->caps.rx_chainmask;
|
common->rx_chainmask = ah->caps.rx_chainmask;
|
||||||
} else {
|
} else {
|
||||||
sc->tx_chainmask = 1;
|
common->tx_chainmask = 1;
|
||||||
sc->rx_chainmask = 1;
|
common->rx_chainmask = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
ath_print(ath9k_hw_common(ah), ATH_DBG_CONFIG,
|
ath_print(common, ATH_DBG_CONFIG,
|
||||||
"tx chmask: %d, rx chmask: %d\n",
|
"tx chmask: %d, rx chmask: %d\n",
|
||||||
sc->tx_chainmask, sc->rx_chainmask);
|
common->tx_chainmask,
|
||||||
|
common->rx_chainmask);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void ath_node_attach(struct ath_softc *sc, struct ieee80211_sta *sta)
|
static void ath_node_attach(struct ath_softc *sc, struct ieee80211_sta *sta)
|
||||||
@ -949,6 +954,7 @@ static void ath_key_delete(struct ath_softc *sc, struct ieee80211_key_conf *key)
|
|||||||
static void setup_ht_cap(struct ath_softc *sc,
|
static void setup_ht_cap(struct ath_softc *sc,
|
||||||
struct ieee80211_sta_ht_cap *ht_info)
|
struct ieee80211_sta_ht_cap *ht_info)
|
||||||
{
|
{
|
||||||
|
struct ath_common *common = ath9k_hw_common(sc->sc_ah);
|
||||||
u8 tx_streams, rx_streams;
|
u8 tx_streams, rx_streams;
|
||||||
|
|
||||||
ht_info->ht_supported = true;
|
ht_info->ht_supported = true;
|
||||||
@ -962,11 +968,13 @@ static void setup_ht_cap(struct ath_softc *sc,
|
|||||||
|
|
||||||
/* set up supported mcs set */
|
/* set up supported mcs set */
|
||||||
memset(&ht_info->mcs, 0, sizeof(ht_info->mcs));
|
memset(&ht_info->mcs, 0, sizeof(ht_info->mcs));
|
||||||
tx_streams = !(sc->tx_chainmask & (sc->tx_chainmask - 1)) ? 1 : 2;
|
tx_streams = !(common->tx_chainmask & (common->tx_chainmask - 1)) ?
|
||||||
rx_streams = !(sc->rx_chainmask & (sc->rx_chainmask - 1)) ? 1 : 2;
|
1 : 2;
|
||||||
|
rx_streams = !(common->rx_chainmask & (common->rx_chainmask - 1)) ?
|
||||||
|
1 : 2;
|
||||||
|
|
||||||
if (tx_streams != rx_streams) {
|
if (tx_streams != rx_streams) {
|
||||||
ath_print(ath9k_hw_common(sc->sc_ah), ATH_DBG_CONFIG,
|
ath_print(common, ATH_DBG_CONFIG,
|
||||||
"TX streams %d, RX streams: %d\n",
|
"TX streams %d, RX streams: %d\n",
|
||||||
tx_streams, rx_streams);
|
tx_streams, rx_streams);
|
||||||
ht_info->mcs.tx_params |= IEEE80211_HT_MCS_TX_RX_DIFF;
|
ht_info->mcs.tx_params |= IEEE80211_HT_MCS_TX_RX_DIFF;
|
||||||
@ -1759,8 +1767,8 @@ static int ath_init_softc(u16 devid, struct ath_softc *sc, u16 subsysid)
|
|||||||
sc->sc_flags |= SC_OP_RXAGGR;
|
sc->sc_flags |= SC_OP_RXAGGR;
|
||||||
}
|
}
|
||||||
|
|
||||||
sc->tx_chainmask = ah->caps.tx_chainmask;
|
common->tx_chainmask = ah->caps.tx_chainmask;
|
||||||
sc->rx_chainmask = ah->caps.rx_chainmask;
|
common->rx_chainmask = ah->caps.rx_chainmask;
|
||||||
|
|
||||||
ath9k_hw_setcapability(ah, ATH9K_CAP_DIVERSITY, 1, true, NULL);
|
ath9k_hw_setcapability(ah, ATH9K_CAP_DIVERSITY, 1, true, NULL);
|
||||||
sc->rx.defant = ath9k_hw_getdefantenna(ah);
|
sc->rx.defant = ath9k_hw_getdefantenna(ah);
|
||||||
|
@ -1456,6 +1456,7 @@ static u32 ath_pkt_duration(struct ath_softc *sc, u8 rix, struct ath_buf *bf,
|
|||||||
|
|
||||||
static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf)
|
static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf)
|
||||||
{
|
{
|
||||||
|
struct ath_common *common = ath9k_hw_common(sc->sc_ah);
|
||||||
const struct ath_rate_table *rt = sc->cur_rate_table;
|
const struct ath_rate_table *rt = sc->cur_rate_table;
|
||||||
struct ath9k_11n_rate_series series[4];
|
struct ath9k_11n_rate_series series[4];
|
||||||
struct sk_buff *skb;
|
struct sk_buff *skb;
|
||||||
@ -1511,7 +1512,7 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf)
|
|||||||
|
|
||||||
rix = rates[i].idx;
|
rix = rates[i].idx;
|
||||||
series[i].Tries = rates[i].count;
|
series[i].Tries = rates[i].count;
|
||||||
series[i].ChSel = sc->tx_chainmask;
|
series[i].ChSel = common->tx_chainmask;
|
||||||
|
|
||||||
if (rates[i].flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE)
|
if (rates[i].flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE)
|
||||||
series[i].Rate = rt->info[rix].ratecode |
|
series[i].Rate = rt->info[rix].ratecode |
|
||||||
|
Loading…
Reference in New Issue
Block a user