Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4d5dc3d authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath9k: do not limit the chainmask to 1 for legacy mode 



Restricting the chainmask to 1 for legacy mode disables useful features
such as MRC, and it reduces the available transmit power.
I can't think of a good reason to do this in legacy mode, so let's just
get rid of that code.

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f1a8abb0

drivers/net/wireless/ath/ath9k/ath9k.h

+0 −1
Original line number Diff line number Diff line
@@ -675,7 +675,6 @@ void ath9k_deinit_device(struct ath_softc *sc); 
void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw);

void ath9k_update_ichannel(struct ath_softc *sc, struct ieee80211_hw *hw,

			   struct ath9k_channel *ichan);

void ath_update_chainmask(struct ath_softc *sc, int is_ht);

int ath_set_channel(struct ath_softc *sc, struct ieee80211_hw *hw,

		    struct ath9k_channel *hchan);

drivers/net/wireless/ath/ath9k/main.c

+0 −32
Original line number Diff line number Diff line
@@ -538,32 +538,6 @@ void ath_ani_calibrate(unsigned long data) 
	}

}



/*

 * Update tx/rx chainmask. For legacy association,

 * hard code chainmask to 1x1, for 11n association, use

 * the chainmask configuration, for bt coexistence, use

 * the chainmask configuration even in legacy mode.

 */

void ath_update_chainmask(struct ath_softc *sc, int is_ht)

{

	struct ath_hw *ah = sc->sc_ah;

	struct ath_common *common = ath9k_hw_common(ah);



	if ((sc->sc_flags & SC_OP_OFFCHANNEL) || is_ht ||

	    (ah->btcoex_hw.scheme != ATH_BTCOEX_CFG_NONE)) {

		common->tx_chainmask = ah->caps.tx_chainmask;

		common->rx_chainmask = ah->caps.rx_chainmask;

	} else {

		common->tx_chainmask = 1;

		common->rx_chainmask = 1;

	}



	ath_dbg(common, ATH_DBG_CONFIG,

		"tx chmask: %d, rx chmask: %d\n",

		common->tx_chainmask,

		common->rx_chainmask);

}



static void ath_node_attach(struct ath_softc *sc, struct ieee80211_sta *sta)

{

	struct ath_node *an;
@@ -1679,8 +1653,6 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed) 
		/* XXX: remove me eventualy */

		ath9k_update_ichannel(sc, hw, &sc->sc_ah->channels[pos]);



		ath_update_chainmask(sc, conf_is_ht(conf));



		/* update survey stats for the old channel before switching */

		spin_lock_irqsave(&common->cc_lock, flags);

		ath_update_survey_stats(sc);
@@ -1912,10 +1884,6 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw, 
		/* Set aggregation protection mode parameters */

		sc->config.ath_aggr_prot = 0;



		/* Only legacy IBSS for now */

		if (vif->type == NL80211_IFTYPE_ADHOC)

			ath_update_chainmask(sc, 0);



		ath_dbg(common, ATH_DBG_CONFIG, "BSSID: %pM aid: 0x%x\n",

			common->curbssid, common->curaid);

drivers/net/wireless/ath/ath9k/virtual.c

+0 −1
Original line number Diff line number Diff line
@@ -288,7 +288,6 @@ void ath9k_wiphy_chan_work(struct work_struct *work) 
	/* sync hw configuration for hw code */

	common->hw = aphy->hw;



	ath_update_chainmask(sc, sc->chan_is_ht);

	if (ath_set_channel(sc, aphy->hw,

			    &sc->sc_ah->channels[sc->chan_idx]) < 0) {

		printk(KERN_DEBUG "ath9k: Failed to set channel for new "