aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-4965.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-4965.h')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-4965.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.h b/drivers/net/wireless/iwlwifi/iwl-4965.h
index 810b8e28dc83..960b53b20df8 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.h
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.h
@@ -66,9 +66,6 @@ extern struct pci_device_id iwl4965_hw_card_ids[];
66 * averages within an s8's (used in some apps) range of negative values. */ 66 * averages within an s8's (used in some apps) range of negative values. */
67#define IWL_NOISE_MEAS_NOT_AVAILABLE (-127) 67#define IWL_NOISE_MEAS_NOT_AVAILABLE (-127)
68 68
69/* Module parameters accessible from iwl-*.c */
70extern struct iwl_mod_params iwl4965_mod_params;
71
72enum iwl4965_antenna { 69enum iwl4965_antenna {
73 IWL_ANTENNA_DIVERSITY, 70 IWL_ANTENNA_DIVERSITY,
74 IWL_ANTENNA_MAIN, 71 IWL_ANTENNA_MAIN,
@@ -761,7 +758,8 @@ extern void iwl4965_hwrate_to_tx_control(struct iwl_priv *priv,
761 struct ieee80211_tx_control *control); 758 struct ieee80211_tx_control *control);
762 759
763#ifdef CONFIG_IWL4965_HT 760#ifdef CONFIG_IWL4965_HT
764void iwl4965_init_ht_hw_capab(struct ieee80211_ht_info *ht_info, 761void iwl4965_init_ht_hw_capab(struct iwl_priv *priv,
762 struct ieee80211_ht_info *ht_info,
765 enum ieee80211_band band); 763 enum ieee80211_band band);
766void iwl4965_set_rxon_ht(struct iwl_priv *priv, 764void iwl4965_set_rxon_ht(struct iwl_priv *priv,
767 struct iwl_ht_info *ht_info); 765 struct iwl_ht_info *ht_info);
@@ -773,7 +771,8 @@ int iwl4965_mac_ampdu_action(struct ieee80211_hw *hw,
773int iwl4965_check_empty_hw_queue(struct iwl_priv *priv, int sta_id, 771int iwl4965_check_empty_hw_queue(struct iwl_priv *priv, int sta_id,
774 u8 tid, int txq_id); 772 u8 tid, int txq_id);
775#else 773#else
776static inline void iwl4965_init_ht_hw_capab(struct ieee80211_ht_info *ht_info, 774static inline void iwl4965_init_ht_hw_capab(struct iwl_priv *priv,
775 struct ieee80211_ht_info *ht_info,
777 enum ieee80211_band band) {} 776 enum ieee80211_band band) {}
778 777
779#endif /*CONFIG_IWL4965_HT */ 778#endif /*CONFIG_IWL4965_HT */