Merge remote-tracking branch 'torvalds/master' into perf/core

[sfrench/cifs-2.6.git] / net / hsr / hsr_main.h

diff --git a/net/hsr/hsr_main.h b/net/hsr/hsr_main.h
index a169808ee78ac59ca938a4d40ccb7c2a4262d879..8f264672b70bd6bd042232db415112fe4efa2c28 100644 (file)
--- a/net/hsr/hsr_main.h
+++ b/net/hsr/hsr_main.h
@@ -22,6 +22,7 @@
 #define HSR_LIFE_CHECK_INTERVAL                 2000 /* ms */
 #define HSR_NODE_FORGET_TIME           60000 /* ms */
 #define HSR_ANNOUNCE_INTERVAL            100 /* ms */
+#define HSR_ENTRY_FORGET_TIME            400 /* ms */
 
 /* By how much may slave1 and slave2 timestamps of latest received frame from
  * each node differ before we notify of communication problem?