diff options
author | John W. Linville <linville@tuxdriver.com> | 2012-04-26 15:03:48 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-04-26 15:03:48 -0400 |
commit | d9b8ae6bd8c3304569a25079fcdbebaa28a48ee4 (patch) | |
tree | 9ce3e4eb355685f970dd7333a0a935109aff0583 /drivers/net/wireless/iwlwifi/iwl-agn.h | |
parent | 872f24dbc604ef585ea7eec73020dcdfaffd1956 (diff) | |
parent | 94c514fe240fc0dd02187b78facefde8b6744634 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/iwl-testmode.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.h | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.h b/drivers/net/wireless/iwlwifi/iwl-agn.h index 942b3649fff1..34900e6523dd 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.h +++ b/drivers/net/wireless/iwlwifi/iwl-agn.h | |||
@@ -64,6 +64,7 @@ | |||
64 | #define __iwl_agn_h__ | 64 | #define __iwl_agn_h__ |
65 | 65 | ||
66 | #include "iwl-dev.h" | 66 | #include "iwl-dev.h" |
67 | #include "iwl-config.h" | ||
67 | 68 | ||
68 | /* The first 11 queues (0-10) are used otherwise */ | 69 | /* The first 11 queues (0-10) are used otherwise */ |
69 | #define IWLAGN_FIRST_AMPDU_QUEUE 11 | 70 | #define IWLAGN_FIRST_AMPDU_QUEUE 11 |
@@ -81,6 +82,7 @@ extern struct iwl_lib_ops iwl6000_lib; | |||
81 | extern struct iwl_lib_ops iwl6030_lib; | 82 | extern struct iwl_lib_ops iwl6030_lib; |
82 | 83 | ||
83 | 84 | ||
85 | #define TIME_UNIT 1024 | ||
84 | 86 | ||
85 | /***************************************************** | 87 | /***************************************************** |
86 | * DRIVER STATUS FUNCTIONS | 88 | * DRIVER STATUS FUNCTIONS |
@@ -154,7 +156,6 @@ void iwl_set_flags_for_band(struct iwl_priv *priv, | |||
154 | struct iwl_rxon_context *ctx, | 156 | struct iwl_rxon_context *ctx, |
155 | enum ieee80211_band band, | 157 | enum ieee80211_band band, |
156 | struct ieee80211_vif *vif); | 158 | struct ieee80211_vif *vif); |
157 | void iwl_set_rate(struct iwl_priv *priv); | ||
158 | 159 | ||
159 | /* uCode */ | 160 | /* uCode */ |
160 | int iwl_send_bt_env(struct iwl_priv *priv, u8 action, u8 type); | 161 | int iwl_send_bt_env(struct iwl_priv *priv, u8 action, u8 type); |
@@ -279,8 +280,8 @@ void iwlagn_bt_adjust_rssi_monitor(struct iwl_priv *priv, bool rssi_ena); | |||
279 | 280 | ||
280 | static inline bool iwl_advanced_bt_coexist(struct iwl_priv *priv) | 281 | static inline bool iwl_advanced_bt_coexist(struct iwl_priv *priv) |
281 | { | 282 | { |
282 | return cfg(priv)->bt_params && | 283 | return priv->cfg->bt_params && |
283 | cfg(priv)->bt_params->advanced_bt_coexist; | 284 | priv->cfg->bt_params->advanced_bt_coexist; |
284 | } | 285 | } |
285 | 286 | ||
286 | #ifdef CONFIG_IWLWIFI_DEBUG | 287 | #ifdef CONFIG_IWLWIFI_DEBUG |
@@ -472,16 +473,29 @@ static inline void iwl_dvm_set_pmi(struct iwl_priv *priv, bool state) | |||
472 | set_bit(STATUS_POWER_PMI, &priv->status); | 473 | set_bit(STATUS_POWER_PMI, &priv->status); |
473 | else | 474 | else |
474 | clear_bit(STATUS_POWER_PMI, &priv->status); | 475 | clear_bit(STATUS_POWER_PMI, &priv->status); |
475 | iwl_trans_set_pmi(trans(priv), state); | 476 | iwl_trans_set_pmi(priv->trans, state); |
476 | } | 477 | } |
477 | 478 | ||
479 | #ifdef CONFIG_IWLWIFI_DEBUGFS | ||
480 | int iwl_dbgfs_register(struct iwl_priv *priv, const char *name); | ||
481 | void iwl_dbgfs_unregister(struct iwl_priv *priv); | ||
482 | #else | ||
483 | static inline int iwl_dbgfs_register(struct iwl_priv *priv, const char *name) | ||
484 | { | ||
485 | return 0; | ||
486 | } | ||
487 | static inline void iwl_dbgfs_unregister(struct iwl_priv *priv) | ||
488 | { | ||
489 | } | ||
490 | #endif /* CONFIG_IWLWIFI_DEBUGFS */ | ||
491 | |||
478 | #ifdef CONFIG_IWLWIFI_DEBUG | 492 | #ifdef CONFIG_IWLWIFI_DEBUG |
479 | #define IWL_DEBUG_QUIET_RFKILL(m, fmt, args...) \ | 493 | #define IWL_DEBUG_QUIET_RFKILL(m, fmt, args...) \ |
480 | do { \ | 494 | do { \ |
481 | if (!iwl_is_rfkill((m))) \ | 495 | if (!iwl_is_rfkill((m))) \ |
482 | IWL_ERR(m, fmt, ##args); \ | 496 | IWL_ERR(m, fmt, ##args); \ |
483 | else \ | 497 | else \ |
484 | __iwl_err(trans(m)->dev, true, \ | 498 | __iwl_err((m)->dev, true, \ |
485 | !iwl_have_debug_level(IWL_DL_RADIO), \ | 499 | !iwl_have_debug_level(IWL_DL_RADIO), \ |
486 | fmt, ##args); \ | 500 | fmt, ##args); \ |
487 | } while (0) | 501 | } while (0) |
@@ -491,7 +505,7 @@ do { \ | |||
491 | if (!iwl_is_rfkill((m))) \ | 505 | if (!iwl_is_rfkill((m))) \ |
492 | IWL_ERR(m, fmt, ##args); \ | 506 | IWL_ERR(m, fmt, ##args); \ |
493 | else \ | 507 | else \ |
494 | __iwl_err(trans(m)->dev, true, true, fmt, ##args); \ | 508 | __iwl_err((m)->dev, true, true, fmt, ##args); \ |
495 | } while (0) | 509 | } while (0) |
496 | #endif /* CONFIG_IWLWIFI_DEBUG */ | 510 | #endif /* CONFIG_IWLWIFI_DEBUG */ |
497 | 511 | ||