From e6dbc3f1fb346bb0be4a246ac1d7ab6a5f0a156e Mon Sep 17 00:00:00 2001 From: Joakim Tjernlund Date: Thu, 1 Mar 2012 08:12:19 +0000 Subject: [PATCH] --- yaml --- r: 288226 b: refs/heads/master c: 709e1b5cd9e1915ad4f6c470ebf6b55d4a911d8c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/bridge/br_stp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2fe407e22794..4661dcec81a7 100644 --- 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 index c9ef3db737d9..6751ed4e0c07 100644 --- 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));