diff options
author | Meenakshi Venkataraman <meenakshi.venkataraman@intel.com> | 2012-03-14 18:49:37 -0400 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2012-04-12 17:23:21 -0400 |
commit | 1591129d545760e6925bd48b15ce1ff7c25a5df8 (patch) | |
tree | 41f1e0c528343cac38f6f394ceb38ea395a80658 | |
parent | 4d323acdd03414e9d8bbd13dcab08c2d71e0d3a1 (diff) |
iwlwifi: move iwl_send_statistics_request to iwl-agn.c
Move this as part of iwl-core.c 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.c | 19 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 20 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.h | 3 |
4 files changed, 21 insertions, 23 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 3d3302a6df73..09367d430120 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -289,6 +289,25 @@ out: | |||
289 | mutex_unlock(&priv->mutex); | 289 | mutex_unlock(&priv->mutex); |
290 | } | 290 | } |
291 | 291 | ||
292 | int iwl_send_statistics_request(struct iwl_priv *priv, u8 flags, bool clear) | ||
293 | { | ||
294 | struct iwl_statistics_cmd statistics_cmd = { | ||
295 | .configuration_flags = | ||
296 | clear ? IWL_STATS_CONF_CLEAR_STATS : 0, | ||
297 | }; | ||
298 | |||
299 | if (flags & CMD_ASYNC) | ||
300 | return iwl_dvm_send_cmd_pdu(priv, REPLY_STATISTICS_CMD, | ||
301 | CMD_ASYNC, | ||
302 | sizeof(struct iwl_statistics_cmd), | ||
303 | &statistics_cmd); | ||
304 | else | ||
305 | return iwl_dvm_send_cmd_pdu(priv, REPLY_STATISTICS_CMD, | ||
306 | CMD_SYNC, | ||
307 | sizeof(struct iwl_statistics_cmd), | ||
308 | &statistics_cmd); | ||
309 | } | ||
310 | |||
292 | /** | 311 | /** |
293 | * iwl_bg_statistics_periodic - Timer callback to queue statistics | 312 | * iwl_bg_statistics_periodic - Timer callback to queue statistics |
294 | * | 313 | * |
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.h b/drivers/net/wireless/iwlwifi/iwl-agn.h index 455231988d24..a2f68d5f51bb 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.h +++ b/drivers/net/wireless/iwlwifi/iwl-agn.h | |||
@@ -159,6 +159,8 @@ void iwlagn_temperature(struct iwl_priv *priv); | |||
159 | int iwlagn_txfifo_flush(struct iwl_priv *priv, u16 flush_control); | 159 | int iwlagn_txfifo_flush(struct iwl_priv *priv, u16 flush_control); |
160 | void iwlagn_dev_txfifo_flush(struct iwl_priv *priv, u16 flush_control); | 160 | void iwlagn_dev_txfifo_flush(struct iwl_priv *priv, u16 flush_control); |
161 | int iwlagn_send_beacon_cmd(struct iwl_priv *priv); | 161 | int iwlagn_send_beacon_cmd(struct iwl_priv *priv); |
162 | int iwl_send_statistics_request(struct iwl_priv *priv, | ||
163 | u8 flags, bool clear); | ||
162 | #ifdef CONFIG_PM_SLEEP | 164 | #ifdef CONFIG_PM_SLEEP |
163 | int iwlagn_send_patterns(struct iwl_priv *priv, | 165 | int iwlagn_send_patterns(struct iwl_priv *priv, |
164 | struct cfg80211_wowlan *wowlan); | 166 | struct cfg80211_wowlan *wowlan); |
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index e839719cdb49..ae542b7575c3 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c | |||
@@ -43,26 +43,6 @@ | |||
43 | 43 | ||
44 | const u8 iwl_bcast_addr[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; | 44 | const u8 iwl_bcast_addr[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; |
45 | 45 | ||
46 | int iwl_send_statistics_request(struct iwl_priv *priv, u8 flags, bool clear) | ||
47 | { | ||
48 | struct iwl_statistics_cmd statistics_cmd = { | ||
49 | .configuration_flags = | ||
50 | clear ? IWL_STATS_CONF_CLEAR_STATS : 0, | ||
51 | }; | ||
52 | |||
53 | if (flags & CMD_ASYNC) | ||
54 | return iwl_dvm_send_cmd_pdu(priv, REPLY_STATISTICS_CMD, | ||
55 | CMD_ASYNC, | ||
56 | sizeof(struct iwl_statistics_cmd), | ||
57 | &statistics_cmd); | ||
58 | else | ||
59 | return iwl_dvm_send_cmd_pdu(priv, REPLY_STATISTICS_CMD, | ||
60 | CMD_SYNC, | ||
61 | sizeof(struct iwl_statistics_cmd), | ||
62 | &statistics_cmd); | ||
63 | } | ||
64 | |||
65 | |||
66 | 46 | ||
67 | 47 | ||
68 | #ifdef CONFIG_IWLWIFI_DEBUGFS | 48 | #ifdef CONFIG_IWLWIFI_DEBUGFS |
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h index 4d17b85cb1e4..db340ce4a18f 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.h +++ b/drivers/net/wireless/iwlwifi/iwl-core.h | |||
@@ -153,9 +153,6 @@ int __must_check iwl_scan_initiate(struct iwl_priv *priv, | |||
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 | 155 | ||
156 | extern int iwl_send_statistics_request(struct iwl_priv *priv, | ||
157 | u8 flags, bool clear); | ||
158 | |||
159 | static inline const struct ieee80211_supported_band *iwl_get_hw_mode( | 156 | static inline const struct ieee80211_supported_band *iwl_get_hw_mode( |
160 | struct iwl_priv *priv, enum ieee80211_band band) | 157 | struct iwl_priv *priv, enum ieee80211_band band) |
161 | { | 158 | { |