From 2e250b9f1c19e682182a8952965717ead94d1806 Mon Sep 17 00:00:00 2001 From: stephen hemminger Date: Tue, 15 Jun 2010 06:14:12 +0000 Subject: [PATCH] --- yaml --- r: 200537 b: refs/heads/master c: 25442e06d20aaba7d7b16438078a562b3e4cf19b h: refs/heads/master i: 200535: a28019ebc6cd4d1d2350605c82e163b9b4953c7a v: v3 --- [refs] | 2 +- trunk/net/bridge/br_fdb.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 86f572ff700e..6cc1cfd1d7aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aabef8b240880439b91574c9a9e33dcc44bfd8c7 +refs/heads/master: 25442e06d20aaba7d7b16438078a562b3e4cf19b diff --git a/trunk/net/bridge/br_fdb.c b/trunk/net/bridge/br_fdb.c index 26637439965b..b01dde35a69e 100644 --- a/trunk/net/bridge/br_fdb.c +++ b/trunk/net/bridge/br_fdb.c @@ -128,7 +128,7 @@ void br_fdb_cleanup(unsigned long _data) { struct net_bridge *br = (struct net_bridge *)_data; unsigned long delay = hold_time(br); - unsigned long next_timer = jiffies + br->forward_delay; + unsigned long next_timer = jiffies + br->ageing_time; int i; spin_lock_bh(&br->hash_lock); @@ -149,9 +149,7 @@ void br_fdb_cleanup(unsigned long _data) } spin_unlock_bh(&br->hash_lock); - /* Add HZ/4 to ensure we round the jiffies upwards to be after the next - * timer, otherwise we might round down and will have no-op run. */ - mod_timer(&br->gc_timer, round_jiffies(next_timer + HZ/4)); + mod_timer(&br->gc_timer, round_jiffies_up(next_timer)); } /* Completely flush all dynamic entries in forwarding database.*/