aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-dev.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-09-11 13:38:15 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-10-07 16:39:32 -0400
commitfad95bf59bf14f72e7d45d3887044e88b8584637 (patch)
treecec3d3e9354b95abc2d2db8de7112f77ff6c5889 /drivers/net/wireless/iwlwifi/iwl-dev.h
parentf2d0d0e2bab7a325071dbaba3bef51c90868e1e6 (diff)
iwlwifi: clean up ht config naming
Daniel Halperin pointed out that the naming here is rather inconsistent with at least 3 different names being used for one thing in different contexts. Rename the struct to iwl_ht_config (rather than iwl_ht_info) and use ht_conf as a variable for it. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Acked-by: Daniel C Halperin <daniel.c.halperin@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-dev.h')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-dev.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index 961d53440034..e161f8d1766e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -502,7 +502,7 @@ union iwl_ht_rate_supp {
502#define CFG_HT_MPDU_DENSITY_4USEC (0x5) 502#define CFG_HT_MPDU_DENSITY_4USEC (0x5)
503#define CFG_HT_MPDU_DENSITY_DEF CFG_HT_MPDU_DENSITY_4USEC 503#define CFG_HT_MPDU_DENSITY_DEF CFG_HT_MPDU_DENSITY_4USEC
504 504
505struct iwl_ht_info { 505struct iwl_ht_config {
506 /* self configuration data */ 506 /* self configuration data */
507 bool is_ht; 507 bool is_ht;
508 bool is_40mhz; 508 bool is_40mhz;
@@ -1077,7 +1077,7 @@ struct iwl_priv {
1077 struct iwl_chain_noise_data chain_noise_data; 1077 struct iwl_chain_noise_data chain_noise_data;
1078 __le16 sensitivity_tbl[HD_TABLE_SIZE]; 1078 __le16 sensitivity_tbl[HD_TABLE_SIZE];
1079 1079
1080 struct iwl_ht_info current_ht_config; 1080 struct iwl_ht_config current_ht_config;
1081 u8 last_phy_res[100]; 1081 u8 last_phy_res[100];
1082 1082
1083 /* Rate scaling data */ 1083 /* Rate scaling data */