OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[uclinux-h8/linux.git]
/
drivers
/
net
/
wireless
/
intel
/
iwlwifi
/
mvm
/
time-event.h
diff --git
a/drivers/net/wireless/intel/iwlwifi/mvm/time-event.h
b/drivers/net/wireless/intel/iwlwifi/mvm/time-event.h
index
99d9a35
..
3d2e8b6
100644
(file)
--- a/
drivers/net/wireless/intel/iwlwifi/mvm/time-event.h
+++ b/
drivers/net/wireless/intel/iwlwifi/mvm/time-event.h
@@
-115,7
+115,7
@@
* needed by the driver.
*/
-#define IWL_MVM_TE_SESSION_PROTECTION_MAX_TIME_MS
5
00
+#define IWL_MVM_TE_SESSION_PROTECTION_MAX_TIME_MS
6
00
#define IWL_MVM_TE_SESSION_PROTECTION_MIN_TIME_MS 400
/**