---

yaml --- r: 288225 b: refs/heads/master c: aaca735 h: refs/heads/master i: 288223: e24970b v: v3
git-mirror · Mar 5, 2012 · fea78ff · fea78ff
1 parent 3abd221
commit fea78ff
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0638c247f559e1a16ee79e54df14bca2cb679ea
+refs/heads/master: aaca735f4f188641c4786af8f20ed39fcce3809c
diff --git a/trunk/net/bridge/br_stp.c b/trunk/net/bridge/br_stp.c
@@ -17,9 +17,9 @@
 #include "br_private_stp.h"
 
 /* since time values in bpdu are in jiffies and then scaled (1/256)
- * before sending, make sure that is at least one.
+ * before sending, make sure that is at least one STP tick.
  */
-#define MESSAGE_AGE_INCR	((HZ < 256) ? 1 : (HZ/256))
+#define MESSAGE_AGE_INCR	((HZ / 256) + 1)
 
 static const char *const br_port_state_names[] = {
 	[BR_STATE_DISABLED] = "disabled",