aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-08-13 16:30:55 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-08-20 11:33:11 -0400
commit367ca28da433ed9639468be851e1f33468e3485e (patch)
tree598ad86e2edb79d00b357a819ef5159de0ea28a2 /drivers/net
parent415e49936b4b29b34c2fb561eeab867d41fc43a6 (diff)
iwlwifi: remove unused members of iwl_ht_info
Some members of iwl_ht_info are unused, and one of them is write-only, so we can remove these three: max_amsdu_size, ampdu_factor and mpdu_density. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-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')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-core.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-dev.h3
2 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index 479b7e165b09..08345b97cb4c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -2397,8 +2397,6 @@ static void iwl_ht_conf(struct iwl_priv *priv,
2397 iwl_conf->sgf |= HT_SHORT_GI_40MHZ; 2397 iwl_conf->sgf |= HT_SHORT_GI_40MHZ;
2398 2398
2399 iwl_conf->is_green_field = !!(ht_conf->cap & IEEE80211_HT_CAP_GRN_FLD); 2399 iwl_conf->is_green_field = !!(ht_conf->cap & IEEE80211_HT_CAP_GRN_FLD);
2400 iwl_conf->max_amsdu_size =
2401 !!(ht_conf->cap & IEEE80211_HT_CAP_MAX_AMSDU);
2402 2400
2403 iwl_conf->supported_chan_width = 2401 iwl_conf->supported_chan_width =
2404 !!(ht_conf->cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40); 2402 !!(ht_conf->cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40);
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index 0b19a6f93c84..db745343d360 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -509,9 +509,6 @@ struct iwl_ht_info {
509 u8 sm_ps; 509 u8 sm_ps;
510 u8 is_green_field; 510 u8 is_green_field;
511 u8 sgf; /* HT_SHORT_GI_* short guard interval */ 511 u8 sgf; /* HT_SHORT_GI_* short guard interval */
512 u8 max_amsdu_size;
513 u8 ampdu_factor;
514 u8 mpdu_density;
515 struct ieee80211_mcs_info mcs; 512 struct ieee80211_mcs_info mcs;
516 /* BSS related data */ 513 /* BSS related data */
517 u8 extension_chan_offset; 514 u8 extension_chan_offset;