iwlwifi: continue namespace changes - fix CONFIG variables
authorReinette Chatre <reinette.chatre@intel.com>
Thu, 29 Nov 2007 03:09:42 +0000 (11:09 +0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 28 Jan 2008 23:05:13 +0000 (15:05 -0800)
- 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>
drivers/net/wireless/iwlwifi/iwl-3945.h
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/wireless/iwlwifi/iwl4965-base.c

index e5b345de3c61ff7776e8f2f5cc3e2be724214e9f..02040ef10da03d8dc936ffb68fc71ac35c6290dd 100644 (file)
@@ -445,31 +445,6 @@ union iwl3945_ht_rate_supp {
        };
 };
 
-#ifdef CONFIG_IWL3945_HT
-#define CFG_HT_RX_AMPDU_FACTOR_DEF  (0x3)
-#define HT_IE_MAX_AMSDU_SIZE_4K     (0)
-#define CFG_HT_MPDU_DENSITY_2USEC   (0x5)
-#define CFG_HT_MPDU_DENSITY_DEF CFG_HT_MPDU_DENSITY_2USEC
-
-struct sta_ht_info {
-       u8 is_ht;
-       u16 rx_mimo_ps_mode;
-       u16 tx_mimo_ps_mode;
-       u16 control_channel;
-       u8 max_amsdu_size;
-       u8 ampdu_factor;
-       u8 mpdu_density;
-       u8 operating_mode;
-       u8 supported_chan_width;
-       u8 extension_chan_offset;
-       u8 is_green_field;
-       u8 sgf;
-       u8 supp_rates[16];
-       u8 tx_chan_width;
-       u8 chan_width_cap;
-};
-#endif                         /*CONFIG_IWL3945_HT */
-
 #ifdef CONFIG_IWL3945_QOS
 
 union iwl3945_qos_capabity {
index 9b8560d3315aa2dcfdea47fb9151795fcd8d2609..5dee8e512c7d0ce177052ee9dcfc4e85c3eee65a 100644 (file)
@@ -4667,7 +4667,7 @@ void iwl4965_hw_setup_deferred_work(struct iwl4965_priv *priv)
 #ifdef CONFIG_IWL4965_HT
 #ifdef CONFIG_IWL4965_HT_AGG
        INIT_WORK(&priv->agg_work, iwl4965_bg_agg_work);
-#endif /* CONFIG_IWL4965_AGG */
+#endif /* CONFIG_IWL4965_HT_AGG */
 #endif /* CONFIG_IWL4965_HT */
        init_timer(&priv->statistics_periodic);
        priv->statistics_periodic.data = (unsigned long)priv;
index 4fa85d874efa8d31612fd3288fbad450cbec7aff..036e2f1a54682aad5b5252b6dcc8acebcde7fad4 100644 (file)
@@ -7362,7 +7362,7 @@ static int iwl3945_mac_conf_tx(struct ieee80211_hw *hw, int queue,
 #ifdef CONFIG_IWL3945_QOS
        unsigned long flags;
        int q;
-#endif /* CONFIG_IWL_QOS */
+#endif /* CONFIG_IWL3945_QOS */
 
        IWL_DEBUG_MAC80211("enter\n");
 
index 921c662da3806c0a5a28c79f0c45dcfb72453316..11ef1c0c5d0de6de58020aa1fd781ca0c65f745d 100644 (file)
@@ -7795,7 +7795,7 @@ static int iwl4965_mac_conf_tx(struct ieee80211_hw *hw, int queue,
 #ifdef CONFIG_IWL4965_QOS
        unsigned long flags;
        int q;
-#endif /* CONFIG_IWL_QOS */
+#endif /* CONFIG_IWL4965_QOS */
 
        IWL_DEBUG_MAC80211("enter\n");