From e2b388fe86d404b1b7185ceffd5f4d27c576c71c Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 31 May 2007 01:21:39 -0700 Subject: [PATCH] --- yaml --- r: 57169 b: refs/heads/master c: 9a834b87c5544c347fd788cd9d4eb276402ab54a h: refs/heads/master i: 57167: 4ce5b699e2ac355a2bb0520561749e89b1acca1f v: v3 --- [refs] | 2 +- trunk/net/bridge/br_stp.c | 3 ++- trunk/net/bridge/br_stp_timer.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7083ea34e9b6..054acf2ac816 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 071f7722686151817855195654f16a0b65d9473c +refs/heads/master: 9a834b87c5544c347fd788cd9d4eb276402ab54a diff --git a/trunk/net/bridge/br_stp.c b/trunk/net/bridge/br_stp.c index 0e035d6162cc..e38034aa56f5 100644 --- a/trunk/net/bridge/br_stp.c +++ b/trunk/net/bridge/br_stp.c @@ -178,7 +178,8 @@ void br_transmit_config(struct net_bridge_port *p) br_send_config_bpdu(p, &bpdu); p->topology_change_ack = 0; p->config_pending = 0; - mod_timer(&p->hold_timer, jiffies + BR_HOLD_TIME); + mod_timer(&p->hold_timer, + round_jiffies(jiffies + BR_HOLD_TIME)); } } diff --git a/trunk/net/bridge/br_stp_timer.c b/trunk/net/bridge/br_stp_timer.c index 24e0ca4a3131..77f5255e6915 100644 --- a/trunk/net/bridge/br_stp_timer.c +++ b/trunk/net/bridge/br_stp_timer.c @@ -42,7 +42,7 @@ static void br_hello_timer_expired(unsigned long arg) if (br->dev->flags & IFF_UP) { br_config_bpdu_generation(br); - mod_timer(&br->hello_timer, jiffies + br->hello_time); + mod_timer(&br->hello_timer, round_jiffies(jiffies + br->hello_time)); } spin_unlock(&br->lock); }