aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi
diff options
context:
space:
mode:
authorReinette Chatre <reinette.chatre@intel.com>2007-11-28 22:09:42 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:05:13 -0500
commit0054b34d295f0c77110c8c8ae5e3320ef40617b2 (patch)
treea63e632b8c22c27b22b299329bcbc735caede9fc /drivers/net/wireless/iwlwifi
parent90e759d14cd58ea1e34042bab930ce434fa0e4fa (diff)
iwlwifi: continue namespace changes - fix CONFIG variables
- Remove HT code from iwl-3945.h - it is not needed here as 3945 does not support HT. The code ended up here during the header file split. - Modify a few places where the CONFIG variables were named incorrectly: all changes are to comments only. 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')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-3945.h25
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-4965.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl4965-base.c2
4 files changed, 3 insertions, 28 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.h b/drivers/net/wireless/iwlwifi/iwl-3945.h
index e5b345de3c61..02040ef10da0 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.h
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.h
@@ -445,31 +445,6 @@ union iwl3945_ht_rate_supp {
445 }; 445 };
446}; 446};
447 447
448#ifdef CONFIG_IWL3945_HT
449#define CFG_HT_RX_AMPDU_FACTOR_DEF (0x3)
450#define HT_IE_MAX_AMSDU_SIZE_4K (0)
451#define CFG_HT_MPDU_DENSITY_2USEC (0x5)
452#define CFG_HT_MPDU_DENSITY_DEF CFG_HT_MPDU_DENSITY_2USEC
453
454struct sta_ht_info {
455 u8 is_ht;
456 u16 rx_mimo_ps_mode;
457 u16 tx_mimo_ps_mode;
458 u16 control_channel;
459 u8 max_amsdu_size;
460 u8 ampdu_factor;
461 u8 mpdu_density;
462 u8 operating_mode;
463 u8 supported_chan_width;
464 u8 extension_chan_offset;
465 u8 is_green_field;
466 u8 sgf;
467 u8 supp_rates[16];
468 u8 tx_chan_width;
469 u8 chan_width_cap;
470};
471#endif /*CONFIG_IWL3945_HT */
472
473#ifdef CONFIG_IWL3945_QOS 448#ifdef CONFIG_IWL3945_QOS
474 449
475union iwl3945_qos_capabity { 450union iwl3945_qos_capabity {
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index 9b8560d3315a..5dee8e512c7d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -4667,7 +4667,7 @@ void iwl4965_hw_setup_deferred_work(struct iwl4965_priv *priv)
4667#ifdef CONFIG_IWL4965_HT 4667#ifdef CONFIG_IWL4965_HT
4668#ifdef CONFIG_IWL4965_HT_AGG 4668#ifdef CONFIG_IWL4965_HT_AGG
4669 INIT_WORK(&priv->agg_work, iwl4965_bg_agg_work); 4669 INIT_WORK(&priv->agg_work, iwl4965_bg_agg_work);
4670#endif /* CONFIG_IWL4965_AGG */ 4670#endif /* CONFIG_IWL4965_HT_AGG */
4671#endif /* CONFIG_IWL4965_HT */ 4671#endif /* CONFIG_IWL4965_HT */
4672 init_timer(&priv->statistics_periodic); 4672 init_timer(&priv->statistics_periodic);
4673 priv->statistics_periodic.data = (unsigned long)priv; 4673 priv->statistics_periodic.data = (unsigned long)priv;
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 4fa85d874efa..036e2f1a5468 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -7362,7 +7362,7 @@ static int iwl3945_mac_conf_tx(struct ieee80211_hw *hw, int queue,
7362#ifdef CONFIG_IWL3945_QOS 7362#ifdef CONFIG_IWL3945_QOS
7363 unsigned long flags; 7363 unsigned long flags;
7364 int q; 7364 int q;
7365#endif /* CONFIG_IWL_QOS */ 7365#endif /* CONFIG_IWL3945_QOS */
7366 7366
7367 IWL_DEBUG_MAC80211("enter\n"); 7367 IWL_DEBUG_MAC80211("enter\n");
7368 7368
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index 921c662da380..11ef1c0c5d0d 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -7795,7 +7795,7 @@ static int iwl4965_mac_conf_tx(struct ieee80211_hw *hw, int queue,
7795#ifdef CONFIG_IWL4965_QOS 7795#ifdef CONFIG_IWL4965_QOS
7796 unsigned long flags; 7796 unsigned long flags;
7797 int q; 7797 int q;
7798#endif /* CONFIG_IWL_QOS */ 7798#endif /* CONFIG_IWL4965_QOS */
7799 7799
7800 IWL_DEBUG_MAC80211("enter\n"); 7800 IWL_DEBUG_MAC80211("enter\n");
7801 7801