aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWey-Yi Guy <wey-yi.w.guy@intel.com>2010-07-14 11:08:05 -0400
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2010-07-23 11:41:04 -0400
commitaf8ee0553b4ce077319190cde680d74ad18ddfad (patch)
treea2ea31301b93c9347565e4358141563e41d9bb6d
parent325322ee34d726bff922853d509e135c8d262e2f (diff)
iwlagn: add .cfg flag to idenfity the need for bt statistics
Only WiFi/BT combo devices need to use bluetooth version of statistics notification; adding the flag in .cfg file to indicate the need for using different data structure. Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-6000.c6
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-core.h1
2 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
index 095521952bb..a4e58d85f88 100644
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -500,6 +500,7 @@ struct iwl_cfg iwl6000g2b_2agn_cfg = {
500 .sensitivity_calib_by_driver = true, 500 .sensitivity_calib_by_driver = true,
501 .chain_noise_calib_by_driver = true, 501 .chain_noise_calib_by_driver = true,
502 .need_dc_calib = true, 502 .need_dc_calib = true,
503 .bt_statistics = true,
503}; 504};
504 505
505struct iwl_cfg iwl6000g2b_2abg_cfg = { 506struct iwl_cfg iwl6000g2b_2abg_cfg = {
@@ -535,6 +536,7 @@ struct iwl_cfg iwl6000g2b_2abg_cfg = {
535 .sensitivity_calib_by_driver = true, 536 .sensitivity_calib_by_driver = true,
536 .chain_noise_calib_by_driver = true, 537 .chain_noise_calib_by_driver = true,
537 .need_dc_calib = true, 538 .need_dc_calib = true,
539 .bt_statistics = true,
538}; 540};
539 541
540struct iwl_cfg iwl6000g2b_2bgn_cfg = { 542struct iwl_cfg iwl6000g2b_2bgn_cfg = {
@@ -572,6 +574,7 @@ struct iwl_cfg iwl6000g2b_2bgn_cfg = {
572 .sensitivity_calib_by_driver = true, 574 .sensitivity_calib_by_driver = true,
573 .chain_noise_calib_by_driver = true, 575 .chain_noise_calib_by_driver = true,
574 .need_dc_calib = true, 576 .need_dc_calib = true,
577 .bt_statistics = true,
575}; 578};
576 579
577struct iwl_cfg iwl6000g2b_2bg_cfg = { 580struct iwl_cfg iwl6000g2b_2bg_cfg = {
@@ -607,6 +610,7 @@ struct iwl_cfg iwl6000g2b_2bg_cfg = {
607 .sensitivity_calib_by_driver = true, 610 .sensitivity_calib_by_driver = true,
608 .chain_noise_calib_by_driver = true, 611 .chain_noise_calib_by_driver = true,
609 .need_dc_calib = true, 612 .need_dc_calib = true,
613 .bt_statistics = true,
610}; 614};
611 615
612struct iwl_cfg iwl6000g2b_bgn_cfg = { 616struct iwl_cfg iwl6000g2b_bgn_cfg = {
@@ -644,6 +648,7 @@ struct iwl_cfg iwl6000g2b_bgn_cfg = {
644 .sensitivity_calib_by_driver = true, 648 .sensitivity_calib_by_driver = true,
645 .chain_noise_calib_by_driver = true, 649 .chain_noise_calib_by_driver = true,
646 .need_dc_calib = true, 650 .need_dc_calib = true,
651 .bt_statistics = true,
647}; 652};
648 653
649struct iwl_cfg iwl6000g2b_bg_cfg = { 654struct iwl_cfg iwl6000g2b_bg_cfg = {
@@ -679,6 +684,7 @@ struct iwl_cfg iwl6000g2b_bg_cfg = {
679 .sensitivity_calib_by_driver = true, 684 .sensitivity_calib_by_driver = true,
680 .chain_noise_calib_by_driver = true, 685 .chain_noise_calib_by_driver = true,
681 .need_dc_calib = true, 686 .need_dc_calib = true,
687 .bt_statistics = true,
682}; 688};
683 689
684/* 690/*
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index fcbba3d604d..2954a52a5e8 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -335,6 +335,7 @@ struct iwl_cfg {
335 u8 scan_rx_antennas[IEEE80211_NUM_BANDS]; 335 u8 scan_rx_antennas[IEEE80211_NUM_BANDS];
336 u8 scan_tx_antennas[IEEE80211_NUM_BANDS]; 336 u8 scan_tx_antennas[IEEE80211_NUM_BANDS];
337 const bool need_dc_calib; 337 const bool need_dc_calib;
338 const bool bt_statistics;
338}; 339};
339 340
340/*************************** 341/***************************