Commit b01459e8 authored Jun 11, 2014 by Felix Fietkau Committed by John W. Linville Jun 19, 2014

ath9k: Move caldata into channel context



Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: Rajkumar Manoharan <rmanohar@qti.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent c4dc0d04

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -327,6 +327,8 @@ struct ath_chanctx {
	struct list_head vifs;		struct list_head vifs;
	struct list_head acq[IEEE80211_NUM_ACS];		struct list_head acq[IEEE80211_NUM_ACS];

			struct ath9k_hw_cal_data caldata;

	u16 txpower;		u16 txpower;
	bool offchannel;		bool offchannel;
	bool stopped;		bool stopped;
	@@ -820,8 +822,6 @@ struct ath_softc {
	struct led_classdev led_cdev;		struct led_classdev led_cdev;
	#endif		#endif

	struct ath9k_hw_cal_data caldata;

	#ifdef CONFIG_ATH9K_DEBUGFS		#ifdef CONFIG_ATH9K_DEBUGFS
	struct ath9k_debug debug;		struct ath9k_debug debug;
	#endif		#endif

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1080,7 +1080,7 @@ static ssize_t read_file_dump_nfcal(struct file file, char __user user_buf,
	{		{
	struct ath_softc *sc = file->private_data;		struct ath_softc *sc = file->private_data;
	struct ath_hw *ah = sc->sc_ah;		struct ath_hw *ah = sc->sc_ah;
	struct ath9k_nfcal_hist *h = sc->caldata.nfCalHist;		struct ath9k_nfcal_hist *h = sc->cur_chan->caldata.nfCalHist;
	struct ath_common *common = ath9k_hw_common(ah);		struct ath_common *common = ath9k_hw_common(ah);
	struct ieee80211_conf *conf = &common->hw->conf;		struct ieee80211_conf *conf = &common->hw->conf;
	u32 len = 0, size = 1500;		u32 len = 0, size = 1500;

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -279,7 +279,7 @@ int ath_reset_internal(struct ath_softc sc, struct ath9k_channel hchan)

	if (!sc->cur_chan->offchannel) {		if (!sc->cur_chan->offchannel) {
	fastcc = false;		fastcc = false;
	caldata = &sc->caldata;		caldata = &sc->cur_chan->caldata;
	}		}

	if (!hchan) {		if (!hchan) {

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -706,7 +706,7 @@ void ath9k_mci_set_txpower(struct ath_softc *sc, bool setchannel,
	return;		return;

	if (setchannel) {		if (setchannel) {
	struct ath9k_hw_cal_data *caldata = &sc->caldata;		struct ath9k_hw_cal_data *caldata = &sc->cur_chan->caldata;
	if (IS_CHAN_HT40PLUS(ah->curchan) &&		if (IS_CHAN_HT40PLUS(ah->curchan) &&
	(ah->curchan->channel > caldata->channel) &&		(ah->curchan->channel > caldata->channel) &&
	(ah->curchan->channel <= caldata->channel + 20))		(ah->curchan->channel <= caldata->channel + 20))