]> err.no Git - linux-2.6/commitdiff
bridge: use time_before() in br_fdb_cleanup()
authorFabio Checconi <fabio@gandalf.sssup.it>
Thu, 20 Mar 2008 22:54:58 +0000 (15:54 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 20 Mar 2008 22:54:58 +0000 (15:54 -0700)
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>
net/bridge/br_fdb.c

index bc40377136a2631a19d73372a24f15f2ce010222..9326c377822ed3d6e51e0116c73d22e4aaa84608 100644 (file)
@@ -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;
                }
        }