aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRajkumar Manoharan <rmanohar@qca.qualcomm.com>2012-10-12 04:37:24 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-10-29 15:18:53 -0400
commit77d848372875d2e4cbdbf07030f0e08cab5e7f4d (patch)
tree7293640d6e1ead5a4798dc7113c2b2f7082def39
parentdb60428b1af11cf216bb0736b24b2cf0c7b54071 (diff)
ath9k: fill channel mode in caldata
It is useful to have channel mode in caldata to find out whether operaing channel is in HT40/20 when we are currently on offchannel. It will be used by BTCOEX to enable/disable concurrent tx mechanism later. Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/ath/ath9k/calib.c1
-rw-r--r--drivers/net/wireless/ath/ath9k/hw.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/calib.c b/drivers/net/wireless/ath/ath9k/calib.c
index e5cceb077574..f3448a032e6f 100644
--- a/drivers/net/wireless/ath/ath9k/calib.c
+++ b/drivers/net/wireless/ath/ath9k/calib.c
@@ -410,6 +410,7 @@ void ath9k_init_nfcal_hist_buffer(struct ath_hw *ah,
410 410
411 ah->caldata->channel = chan->channel; 411 ah->caldata->channel = chan->channel;
412 ah->caldata->channelFlags = chan->channelFlags & ~CHANNEL_CW_INT; 412 ah->caldata->channelFlags = chan->channelFlags & ~CHANNEL_CW_INT;
413 ah->caldata->chanmode = chan->chanmode;
413 h = ah->caldata->nfCalHist; 414 h = ah->caldata->nfCalHist;
414 default_nf = ath9k_hw_get_default_nf(ah, chan); 415 default_nf = ath9k_hw_get_default_nf(ah, chan);
415 for (i = 0; i < NUM_NF_READINGS; i++) { 416 for (i = 0; i < NUM_NF_READINGS; i++) {
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index 1d4f5f1fdd8d..3e73bfe2315e 100644
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -401,6 +401,7 @@ enum ath9k_int {
401struct ath9k_hw_cal_data { 401struct ath9k_hw_cal_data {
402 u16 channel; 402 u16 channel;
403 u32 channelFlags; 403 u32 channelFlags;
404 u32 chanmode;
404 int32_t CalValid; 405 int32_t CalValid;
405 int8_t iCoff; 406 int8_t iCoff;
406 int8_t qCoff; 407 int8_t qCoff;