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

Commit 536b3a7a authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

ath9k: rename ath_beaconq_setup() to ath9k_hw_beaconq_setup() 



And move it to hw code on mac.c where it belongs.

Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent bd96d390

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

+0 −1
Original line number Diff line number Diff line
@@ -421,7 +421,6 @@ struct ath_beacon { 


void ath_beacon_tasklet(unsigned long data);

void ath_beacon_config(struct ath_softc *sc, struct ieee80211_vif *vif);

int ath_beaconq_setup(struct ath_hw *ah);

int ath_beacon_alloc(struct ath_wiphy *aphy, struct ieee80211_vif *vif);

void ath_beacon_return(struct ath_softc *sc, struct ath_vif *avp);

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

+0 −12
Original line number Diff line number Diff line
@@ -242,18 +242,6 @@ static void ath_beacon_start_adhoc(struct ath_softc *sc, 
		  sc->beacon.beaconq, ito64(bf->bf_daddr), bf->bf_desc);

}



int ath_beaconq_setup(struct ath_hw *ah)

{

	struct ath9k_tx_queue_info qi;



	memset(&qi, 0, sizeof(qi));

	qi.tqi_aifs = 1;

	qi.tqi_cwmin = 0;

	qi.tqi_cwmax = 0;

	/* NB: don't enable any interrupts */

	return ath9k_hw_setuptxqueue(ah, ATH9K_TX_QUEUE_BEACON, &qi);

}



int ath_beacon_alloc(struct ath_wiphy *aphy, struct ieee80211_vif *vif)

{

	struct ath_softc *sc = aphy->sc;

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

+13 −0
Original line number Diff line number Diff line
@@ -1018,3 +1018,16 @@ bool ath9k_hw_stopdmarecv(struct ath_hw *ah) 
#undef AH_RX_STOP_DMA_TIMEOUT

}

EXPORT_SYMBOL(ath9k_hw_stopdmarecv);



int ath9k_hw_beaconq_setup(struct ath_hw *ah)

{

	struct ath9k_tx_queue_info qi;



	memset(&qi, 0, sizeof(qi));

	qi.tqi_aifs = 1;

	qi.tqi_cwmin = 0;

	qi.tqi_cwmax = 0;

	/* NB: don't enable any interrupts */

	return ath9k_hw_setuptxqueue(ah, ATH9K_TX_QUEUE_BEACON, &qi);

}

EXPORT_SYMBOL(ath9k_hw_beaconq_setup);

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

+1 −0
Original line number Diff line number Diff line
@@ -667,5 +667,6 @@ void ath9k_hw_rxena(struct ath_hw *ah); 
void ath9k_hw_startpcureceive(struct ath_hw *ah);

void ath9k_hw_stoppcurecv(struct ath_hw *ah);

bool ath9k_hw_stopdmarecv(struct ath_hw *ah);

int ath9k_hw_beaconq_setup(struct ath_hw *ah);



#endif /* MAC_H */

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

+1 −1
Original line number Diff line number Diff line
@@ -1709,7 +1709,7 @@ static int ath_init_softc(u16 devid, struct ath_softc *sc, u16 subsysid, 
	 * priority.  Note that the hal handles reseting

	 * these queues at the needed time.

	 */

	sc->beacon.beaconq = ath_beaconq_setup(ah);

	sc->beacon.beaconq = ath9k_hw_beaconq_setup(ah);

	if (sc->beacon.beaconq == -1) {

		ath_print(common, ATH_DBG_FATAL,

			  "Unable to setup a beacon xmit queue\n");