diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-21 06:42:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-21 06:42:24 -0400 |
| commit | a25606c845856e5ca5ed54d23cab077e3a49bf10 (patch) | |
| tree | 1721e46532d6f48d605d401d7cee83f78f551c45 /net/bridge | |
| parent | 938b93adb2642885e688390396472d22a7548748 (diff) | |
| parent | 94833dfb8c98ed4ca1944dd2c1339d88a2d1c758 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_fdb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index bc40377136a2..9326c377822e 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c | |||
| @@ -136,7 +136,7 @@ void br_fdb_cleanup(unsigned long _data) | |||
| 136 | this_timer = f->ageing_timer + delay; | 136 | this_timer = f->ageing_timer + delay; |
| 137 | if (time_before_eq(this_timer, jiffies)) | 137 | if (time_before_eq(this_timer, jiffies)) |
| 138 | fdb_delete(f); | 138 | fdb_delete(f); |
| 139 | else if (this_timer < next_timer) | 139 | else if (time_before(this_timer, next_timer)) |
| 140 | next_timer = this_timer; | 140 | next_timer = this_timer; |
| 141 | } | 141 | } |
| 142 | } | 142 | } |