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

Commit cee1f625 authored by Vasanthakumar Thiagarajan's avatar Vasanthakumar Thiagarajan Committed by John W. Linville
Browse files

ath9k_hw: Add abstraction for rx enable 



Signed-off-by: default avatarVasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ceb26445

drivers/net/wireless/ath/ath9k/hw-ops.h

+5 −0
Original line number Diff line number Diff line
@@ -28,6 +28,11 @@ static inline void ath9k_hw_configpcipowersave(struct ath_hw *ah, 
	ath9k_hw_ops(ah)->config_pci_powersave(ah, restore, power_off);

}



static inline void ath9k_hw_rxena(struct ath_hw *ah)

{

	ath9k_hw_ops(ah)->rx_enable(ah);

}



/* Private hardware call ops */



/* PHY ops */

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

+2 −0
Original line number Diff line number Diff line
@@ -1566,6 +1566,8 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, 
	if (tsf && AR_SREV_9280(ah) && ah->eep_ops->get_eeprom(ah, EEP_OL_PWRCTRL))

		ath9k_hw_settsf64(ah, tsf);



	ar9002_hw_attach_mac_ops(ah);



	if (AR_SREV_9280_10_OR_LATER(ah))

		REG_SET_BIT(ah, AR_GPIO_INPUT_EN_VAL, AR_GPIO_JTAG_DISABLE);

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

+1 −0
Original line number Diff line number Diff line
@@ -509,6 +509,7 @@ struct ath_hw_ops { 
	void (*config_pci_powersave)(struct ath_hw *ah,

				     int restore,

				     int power_off);

	void (*rx_enable)(struct ath_hw *ah);

};



struct ath_hw {

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

+11 −6
Original line number Diff line number Diff line
@@ -16,6 +16,17 @@ 


#include "hw.h"



static void ar9002_hw_rx_enable(struct ath_hw *ah)

{

	REG_WRITE(ah, AR_CR, AR_CR_RXE);

}



void ar9002_hw_attach_mac_ops(struct ath_hw *ah)

{

	struct ath_hw_ops *ops = ath9k_hw_ops(ah);



	ops->rx_enable = ar9002_hw_rx_enable;

}

static void ath9k_hw_set_txq_interrupts(struct ath_hw *ah,

					struct ath9k_tx_queue_info *qi)

{
@@ -999,12 +1010,6 @@ void ath9k_hw_putrxbuf(struct ath_hw *ah, u32 rxdp) 
}

EXPORT_SYMBOL(ath9k_hw_putrxbuf);



void ath9k_hw_rxena(struct ath_hw *ah)

{

	REG_WRITE(ah, AR_CR, AR_CR_RXE);

}

EXPORT_SYMBOL(ath9k_hw_rxena);



void ath9k_hw_startpcureceive(struct ath_hw *ah)

{

	ath9k_enable_mib_counters(ah);

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

+2 −1
Original line number Diff line number Diff line
@@ -729,10 +729,11 @@ void ath9k_hw_setuprxdesc(struct ath_hw *ah, struct ath_desc *ds, 
			  u32 size, u32 flags);

bool ath9k_hw_setrxabort(struct ath_hw *ah, bool set);

void ath9k_hw_putrxbuf(struct ath_hw *ah, u32 rxdp);

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);



void ar9002_hw_attach_mac_ops(struct ath_hw *ah);



#endif /* MAC_H */