mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
This commit is contained in:
commit
a25606c845
14 changed files with 152 additions and 76 deletions
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue