From a061fca7d452bb2fb9f353d816174f2104ed9643 Mon Sep 17 00:00:00 2001 From: Emmanuel Grumbach Date: Wed, 15 Feb 2012 12:48:04 +0200 Subject: [PATCH] --- yaml --- r: 290757 b: refs/heads/master c: 4d660ce52e27957f7181ef662889eec67686c7b5 h: refs/heads/master i: 290755: d0915da7aff925539670153347e21ebed2336e33 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-core.h | 2 ++ trunk/drivers/net/wireless/iwlwifi/iwl-shared.h | 4 ---- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 6ae6234543b1..fbea66082b9e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3e6895c50af9a9574a8bb97268d99be049fe46f0 +refs/heads/master: 4d660ce52e27957f7181ef662889eec67686c7b5 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-core.h b/trunk/drivers/net/wireless/iwlwifi/iwl-core.h index 930e247bbae6..42630f5e8de7 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-core.h +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-core.h @@ -197,6 +197,8 @@ const char *get_ctrl_string(int cmd); void iwl_clear_traffic_stats(struct iwl_priv *priv); void iwl_update_stats(struct iwl_priv *priv, bool is_tx, __le16 fc, u16 len); +void iwl_reset_traffic_log(struct iwl_priv *priv); + #else static inline int iwl_alloc_traffic_mem(struct iwl_priv *priv) { diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h b/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h index 5140c7829662..a6441623e6b1 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h @@ -553,10 +553,6 @@ void __releases(wait_entry) iwl_remove_notification(struct iwl_shared *shrd, struct iwl_notification_wait *wait_entry); -#ifdef CONFIG_IWLWIFI_DEBUGFS -void iwl_reset_traffic_log(struct iwl_priv *priv); -#endif /* CONFIG_IWLWIFI_DEBUGFS */ - #define IWL_CMD(x) case x: return #x #define IWL_MASK(lo, hi) ((1 << (hi)) | ((1 << (hi)) - (1 << (lo))))