---

yaml --- r: 288226 b: refs/heads/master c: 709e1b5 h: refs/heads/master v: v3
git-mirror · Mar 5, 2012 · e6dbc3f · e6dbc3f
1 parent fea78ff
commit e6dbc3f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aaca735f4f188641c4786af8f20ed39fcce3809c
+refs/heads/master: 709e1b5cd9e1915ad4f6c470ebf6b55d4a911d8c
diff --git a/trunk/net/bridge/br_stp.c b/trunk/net/bridge/br_stp.c
@@ -186,7 +186,7 @@ static void br_record_config_information(struct net_bridge_port *p,
 	p->designated_cost = bpdu->root_path_cost;
 	p->designated_bridge = bpdu->bridge_id;
 	p->designated_port = bpdu->port_id;
-	p->designated_age = jiffies + bpdu->message_age;
+	p->designated_age = jiffies - bpdu->message_age;
 
 	mod_timer(&p->message_age_timer, jiffies
 		  + (p->br->max_age - bpdu->message_age));