aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeenakshi Venkataraman <meenakshi.venkataraman@intel.com>2012-03-14 19:16:19 -0400
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2012-04-12 17:23:59 -0400
commit1dfdbdd291d7dd28ee68ad23b57d2d300344358a (patch)
treeb61b00ac54e7a4471ed24fc16e9f70e48aabfc63
parentf32cadfc0d084a3cf1523aa59abe532217a970dc (diff)
iwlwifi: move utility functions out of iwl-core.h
Move these functions to iwl-agn.h as part of iwl-core.h cleanup. Signed-off-by: Meenakshi Venkataraman <meenakshi.venkataraman@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.h13
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-core.h13
2 files changed, 13 insertions, 13 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.h b/drivers/net/wireless/iwlwifi/iwl-agn.h
index a2f68d5f51bb..67d89dc4cae3 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.h
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.h
@@ -161,6 +161,13 @@ void iwlagn_dev_txfifo_flush(struct iwl_priv *priv, u16 flush_control);
161int iwlagn_send_beacon_cmd(struct iwl_priv *priv); 161int iwlagn_send_beacon_cmd(struct iwl_priv *priv);
162int iwl_send_statistics_request(struct iwl_priv *priv, 162int iwl_send_statistics_request(struct iwl_priv *priv,
163 u8 flags, bool clear); 163 u8 flags, bool clear);
164
165static inline const struct ieee80211_supported_band *iwl_get_hw_mode(
166 struct iwl_priv *priv, enum ieee80211_band band)
167{
168 return priv->hw->wiphy->bands[band];
169}
170
164#ifdef CONFIG_PM_SLEEP 171#ifdef CONFIG_PM_SLEEP
165int iwlagn_send_patterns(struct iwl_priv *priv, 172int iwlagn_send_patterns(struct iwl_priv *priv,
166 struct cfg80211_wowlan *wowlan); 173 struct cfg80211_wowlan *wowlan);
@@ -228,6 +235,12 @@ void iwlagn_bt_cancel_deferred_work(struct iwl_priv *priv);
228void iwlagn_bt_coex_rssi_monitor(struct iwl_priv *priv); 235void iwlagn_bt_coex_rssi_monitor(struct iwl_priv *priv);
229void iwlagn_bt_adjust_rssi_monitor(struct iwl_priv *priv, bool rssi_ena); 236void iwlagn_bt_adjust_rssi_monitor(struct iwl_priv *priv, bool rssi_ena);
230 237
238static inline bool iwl_advanced_bt_coexist(struct iwl_priv *priv)
239{
240 return cfg(priv)->bt_params &&
241 cfg(priv)->bt_params->advanced_bt_coexist;
242}
243
231#ifdef CONFIG_IWLWIFI_DEBUG 244#ifdef CONFIG_IWLWIFI_DEBUG
232const char *iwl_get_tx_fail_reason(u32 status); 245const char *iwl_get_tx_fail_reason(u32 status);
233const char *iwl_get_agg_tx_fail_reason(u16 status); 246const char *iwl_get_agg_tx_fail_reason(u16 status);
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index db340ce4a18f..ddbf9cad2356 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -152,19 +152,6 @@ int __must_check iwl_scan_initiate(struct iwl_priv *priv,
152/***************************************************** 152/*****************************************************
153 * S e n d i n g H o s t C o m m a n d s * 153 * S e n d i n g H o s t C o m m a n d s *
154 *****************************************************/ 154 *****************************************************/
155
156static inline const struct ieee80211_supported_band *iwl_get_hw_mode(
157 struct iwl_priv *priv, enum ieee80211_band band)
158{
159 return priv->hw->wiphy->bands[band];
160}
161
162static inline bool iwl_advanced_bt_coexist(struct iwl_priv *priv)
163{
164 return cfg(priv)->bt_params &&
165 cfg(priv)->bt_params->advanced_bt_coexist;
166}
167
168extern bool bt_siso_mode; 155extern bool bt_siso_mode;
169 156
170#endif /* __iwl_core_h__ */ 157#endif /* __iwl_core_h__ */