diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-08-03 11:04:34 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-08-03 11:04:34 +0200 |
| commit | c88417fd85d1a2d01d3f5a6b1b10c4e5d26e7436 (patch) | |
| tree | 9e9d53b10f705b6b6b5eaf178a90a21779b3d6d7 /net/bridge/br_fdb.c | |
| parent | cd4e15ad91d24bdffc6c4cb5f05be916154229a3 (diff) | |
| parent | 15b059e0f9e31f0e7f6b5397368054c005949fea (diff) | |
Merge stable update
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.33.y
Conflicts:
Makefile
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'net/bridge/br_fdb.c')
| -rw-r--r-- | net/bridge/br_fdb.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index 3b8e038ab32c..900431c69ed4 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c @@ -127,7 +127,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); @@ -148,9 +148,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.*/ |