git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/hda' into for-linus
[pandora-kernel.git]
/
drivers
/
infiniband
/
hw
/
nes
/
nes_cm.h
diff --git
a/drivers/infiniband/hw/nes/nes_cm.h
b/drivers/infiniband/hw/nes/nes_cm.h
index
80bba18
..
8b7e7c0
100644
(file)
--- a/
drivers/infiniband/hw/nes/nes_cm.h
+++ b/
drivers/infiniband/hw/nes/nes_cm.h
@@
-149,6
+149,7
@@
struct nes_timer_entry {
#endif
#define NES_SHORT_TIME (10)
#define NES_LONG_TIME (2000*HZ/1000)
+#define NES_MAX_TIMEOUT ((unsigned long) (12*HZ))
#define NES_CM_HASHTABLE_SIZE 1024
#define NES_CM_TCP_TIMER_INTERVAL 3000