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

Commit d77bf3eb authored by Rajkumar Manoharan's avatar Rajkumar Manoharan Committed by John W. Linville
Browse files

ath9k: Remove SC_OP_ENABLE_APM 



Signed-off-by: default avatarRajkumar Manoharan <rmanohar@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 56266bff

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

+1 −2
Original line number Diff line number Diff line
@@ -558,8 +558,7 @@ struct ath_ant_comb { 
#define SC_OP_BT_PRIORITY_DETECTED   BIT(12)

#define SC_OP_BT_SCAN		     BIT(13)

#define SC_OP_ANI_RUN		     BIT(14)

#define SC_OP_ENABLE_APM	     BIT(15)

#define SC_OP_PRIM_STA_VIF	     BIT(16)

#define SC_OP_PRIM_STA_VIF	     BIT(15)



/* Powersave flags */

#define PS_WAIT_FOR_BEACON        BIT(0)

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

+0 −4
Original line number Diff line number Diff line
@@ -565,7 +565,6 @@ void ath_ani_calibrate(unsigned long data) 
static void ath_node_attach(struct ath_softc *sc, struct ieee80211_sta *sta)

{

	struct ath_node *an;

	struct ath_hw *ah = sc->sc_ah;

	an = (struct ath_node *)sta->drv_priv;



#ifdef CONFIG_ATH9K_DEBUGFS
@@ -574,9 +573,6 @@ static void ath_node_attach(struct ath_softc *sc, struct ieee80211_sta *sta) 
	spin_unlock(&sc->nodes_lock);

	an->sta = sta;

#endif

	if ((ah->caps.hw_caps) & ATH9K_HW_CAP_APM)

		sc->sc_flags |= SC_OP_ENABLE_APM;



	if (sc->sc_flags & SC_OP_TXAGGR) {

		ath_tx_node_init(sc, an);

		an->maxampdu = 1 << (IEEE80211_HT_MAX_AMPDU_FACTOR +

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

+3 −3
Original line number Diff line number Diff line
@@ -1584,7 +1584,7 @@ u8 ath_txchainmask_reduction(struct ath_softc *sc, u8 chainmask, u32 rate) 
{

	struct ath_hw *ah = sc->sc_ah;

	struct ath9k_channel *curchan = ah->curchan;

	if ((sc->sc_flags & SC_OP_ENABLE_APM) &&

	if ((ah->caps.hw_caps & ATH9K_HW_CAP_APM) &&

	    (curchan->channelFlags & CHANNEL_5GHZ) &&

	    (chainmask == 0x7) && (rate < 0x90))

		return 0x3;