From f9f26b0a9802d19f6c4eda5bc059b4bbb33bd069 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Mon, 5 Mar 2012 11:24:46 -0800 Subject: [PATCH] --- yaml --- r: 291194 b: refs/heads/master c: 61f0439277abb4f65d99b362b62cbabbde7032a0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-core.h | 4 ++++ trunk/drivers/net/wireless/iwlwifi/iwl-shared.h | 3 --- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 84472f69ca27..164a2a6a360c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0439bb6200153406abb81b469b82d2336be0d175 +refs/heads/master: 61f0439277abb4f65d99b362b62cbabbde7032a0 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-core.h b/trunk/drivers/net/wireless/iwlwifi/iwl-core.h index 42630f5e8de7..db44115a6775 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-core.h +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-core.h @@ -265,6 +265,10 @@ int __must_check iwl_scan_initiate(struct iwl_priv *priv, #define IWL_SCAN_CHECK_WATCHDOG (HZ * 7) +/* traffic log definitions */ +#define IWL_TRAFFIC_ENTRIES (256) +#define IWL_TRAFFIC_ENTRY_SIZE (64) + /***************************************************** * S e n d i n g H o s t C o m m a n d s * *****************************************************/ diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h b/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h index 976e6c584ac7..b816e70d1445 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h @@ -445,9 +445,6 @@ iwl_remove_notification(struct iwl_shared *shrd, #define IWL_CMD(x) case x: return #x -#define IWL_TRAFFIC_ENTRIES (256) -#define IWL_TRAFFIC_ENTRY_SIZE (64) - /***************************************************** * DRIVER STATUS FUNCTIONS ******************************************************/