diff options
author | Reinette Chatre <reinette.chatre@intel.com> | 2009-08-07 18:41:49 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-08-14 09:13:50 -0400 |
commit | 450ccb36b4d8a18c34643335d3305ec1a781e717 (patch) | |
tree | 1919c35f5d343e023ba48537538e1521ea5ab305 /drivers/net/wireless/iwlwifi | |
parent | 3ad3b92a5517c043ef30e4b95c4c39a35bbc36be (diff) |
iwlwifi: fix missing EXPORT_SYMBOL
When compiling without CONFIG_IWLWIFI_DEBUGFS there is a missing
iwl_update_stats symbol. This is fixed by making this function an inline in
the case when CONFIG_IWLWIFI_DEBUGFS is not set due to the hot path in
which it is used.
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 16 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.h | 19 |
2 files changed, 17 insertions, 18 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index 22961e906cb1..44d01a2f2941 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c | |||
@@ -3172,22 +3172,6 @@ void iwl_update_stats(struct iwl_priv *priv, bool is_tx, __le16 fc, u16 len) | |||
3172 | } | 3172 | } |
3173 | } | 3173 | } |
3174 | EXPORT_SYMBOL(iwl_update_stats); | 3174 | EXPORT_SYMBOL(iwl_update_stats); |
3175 | |||
3176 | #else | ||
3177 | void iwl_update_stats(struct iwl_priv *priv, bool is_tx, __le16 fc, u16 len) | ||
3178 | { | ||
3179 | struct traffic_stats *stats; | ||
3180 | |||
3181 | if (is_tx) | ||
3182 | stats = &priv->tx_stats; | ||
3183 | else | ||
3184 | stats = &priv->rx_stats; | ||
3185 | |||
3186 | if (ieee80211_is_data(fc)) { | ||
3187 | /* data */ | ||
3188 | stats->data_bytes += len; | ||
3189 | } | ||
3190 | } | ||
3191 | #endif | 3175 | #endif |
3192 | 3176 | ||
3193 | #ifdef CONFIG_PM | 3177 | #ifdef CONFIG_PM |
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h index ea8748dd675d..32750f4f1ce1 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.h +++ b/drivers/net/wireless/iwlwifi/iwl-core.h | |||
@@ -314,6 +314,8 @@ const char *get_mgmt_string(int cmd); | |||
314 | const char *get_ctrl_string(int cmd); | 314 | const char *get_ctrl_string(int cmd); |
315 | void iwl_clear_tx_stats(struct iwl_priv *priv); | 315 | void iwl_clear_tx_stats(struct iwl_priv *priv); |
316 | void iwl_clear_rx_stats(struct iwl_priv *priv); | 316 | void iwl_clear_rx_stats(struct iwl_priv *priv); |
317 | void iwl_update_stats(struct iwl_priv *priv, bool is_tx, __le16 fc, | ||
318 | u16 len); | ||
317 | #else | 319 | #else |
318 | static inline int iwl_alloc_traffic_mem(struct iwl_priv *priv) | 320 | static inline int iwl_alloc_traffic_mem(struct iwl_priv *priv) |
319 | { | 321 | { |
@@ -333,9 +335,22 @@ static inline void iwl_dbg_log_rx_data_frame(struct iwl_priv *priv, | |||
333 | u16 length, struct ieee80211_hdr *header) | 335 | u16 length, struct ieee80211_hdr *header) |
334 | { | 336 | { |
335 | } | 337 | } |
338 | static inline void iwl_update_stats(struct iwl_priv *priv, bool is_tx, | ||
339 | __le16 fc, u16 len) | ||
340 | { | ||
341 | struct traffic_stats *stats; | ||
342 | |||
343 | if (is_tx) | ||
344 | stats = &priv->tx_stats; | ||
345 | else | ||
346 | stats = &priv->rx_stats; | ||
347 | |||
348 | if (ieee80211_is_data(fc)) { | ||
349 | /* data */ | ||
350 | stats->data_bytes += len; | ||
351 | } | ||
352 | } | ||
336 | #endif | 353 | #endif |
337 | void iwl_update_stats(struct iwl_priv *priv, bool is_tx, __le16 fc, | ||
338 | u16 len); | ||
339 | /***************************************************** | 354 | /***************************************************** |
340 | * RX handlers. | 355 | * RX handlers. |
341 | * **************************************************/ | 356 | * **************************************************/ |