From: Fabio Checconi <fabio@gandalf.sssup.it>
Date: Thu, 20 Mar 2008 22:54:58 +0000 (-0700)
Subject: bridge: use time_before() in br_fdb_cleanup()
X-Git-Tag: v2.6.25-rc7~54^2~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2bec008ca9fd009aa503b75344d1c22da9256141;p=linux-2.6-omap-h63xx.git

bridge: use time_before() in br_fdb_cleanup()

In br_fdb_cleanup() next_timer and this_timer are in jiffies, so they
should be compared using the time_after() macro.

Signed-off-by: Fabio Checconi <fabio@gandalf.sssup.it>
Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index bc40377136a..9326c377822 100644
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -136,7 +136,7 @@ void br_fdb_cleanup(unsigned long _data)
 			this_timer = f->ageing_timer + delay;
 			if (time_before_eq(this_timer, jiffies))
 				fdb_delete(f);
-			else if (this_timer < next_timer)
+			else if (time_before(this_timer, next_timer))
 				next_timer = this_timer;
 		}
 	}