Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Felix Fietkau and committed by
John W. Linville
b01459e8 c4dc0d04

+5 -5
+2 -2
drivers/net/wireless/ath/ath9k/ath9k.h
··· 327 327 struct list_head vifs; 328 328 struct list_head acq[IEEE80211_NUM_ACS]; 329 329 330 + struct ath9k_hw_cal_data caldata; 331 + 330 332 u16 txpower; 331 333 bool offchannel; 332 334 bool stopped; ··· 821 819 char led_name[32]; 822 820 struct led_classdev led_cdev; 823 821 #endif 824 - 825 - struct ath9k_hw_cal_data caldata; 826 822 827 823 #ifdef CONFIG_ATH9K_DEBUGFS 828 824 struct ath9k_debug debug;
+1 -1
drivers/net/wireless/ath/ath9k/debug.c
··· 1080 1080 { 1081 1081 struct ath_softc *sc = file->private_data; 1082 1082 struct ath_hw *ah = sc->sc_ah; 1083 - struct ath9k_nfcal_hist *h = sc->caldata.nfCalHist; 1083 + struct ath9k_nfcal_hist *h = sc->cur_chan->caldata.nfCalHist; 1084 1084 struct ath_common *common = ath9k_hw_common(ah); 1085 1085 struct ieee80211_conf *conf = &common->hw->conf; 1086 1086 u32 len = 0, size = 1500;
+1 -1
drivers/net/wireless/ath/ath9k/main.c
··· 279 279 280 280 if (!sc->cur_chan->offchannel) { 281 281 fastcc = false; 282 - caldata = &sc->caldata; 282 + caldata = &sc->cur_chan->caldata; 283 283 } 284 284 285 285 if (!hchan) {
+1 -1
drivers/net/wireless/ath/ath9k/mci.c
··· 706 706 return; 707 707 708 708 if (setchannel) { 709 - struct ath9k_hw_cal_data *caldata = &sc->caldata; 709 + struct ath9k_hw_cal_data *caldata = &sc->cur_chan->caldata; 710 710 if (IS_CHAN_HT40PLUS(ah->curchan) && 711 711 (ah->curchan->channel > caldata->channel) && 712 712 (ah->curchan->channel <= caldata->channel + 20))