chromeos/compat-wireless/drivers/net/wireless/iwlwifi/iwl-dev.h - Issue 5326002: Update compat-wireless to 2.6.36-5-spn

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chromeos/compat-wireless/drivers/net/wireless/iwlwifi/iwl-dev.h

Issue 5326002: Update compat-wireless to 2.6.36-5-spn (Closed) Base URL: http://git.chromium.org/git/kernel.git@master

Patch Set: Fixes for !ACK handling, missing local changes, log message fixes Created 10 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chromeos/compat-wireless/drivers/net/wireless/iwlwifi/iwl-dev.h

diff --git a/chromeos/compat-wireless/drivers/net/wireless/iwlwifi/iwl-dev.h b/chromeos/compat-wireless/drivers/net/wireless/iwlwifi/iwl-dev.h

index f35bcad56e36bd68779edb3acf930d6b7595359a..2e97cd2fa98a6e0c7d9cdc6d98582ac54fe28459 100644

--- a/chromeos/compat-wireless/drivers/net/wireless/iwlwifi/iwl-dev.h

+++ b/chromeos/compat-wireless/drivers/net/wireless/iwlwifi/iwl-dev.h

@@ -1049,7 +1049,8 @@ struct iwl_event_log {

#define IWL_DELAY_NEXT_FORCE_FW_RELOAD (HZ*5)

/* timer constants use to monitor and recover stuck tx queues in mSecs */

-#define IWL_MONITORING_PERIOD (1000)

+#define IWL_DEF_MONITORING_PERIOD (1000)

+#define IWL_LONG_MONITORING_PERIOD (5000)

#define IWL_ONE_HUNDRED_MSECS (100)

#define IWL_SIXTY_SECS (60000)