diff options
Diffstat (limited to 'net/bridge')
-rw-r--r-- | net/bridge/br_fdb.c | 2 | ||||
-rw-r--r-- | net/bridge/br_stp_timer.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index d21f32383517..9ce430b4657c 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c | |||
@@ -312,7 +312,7 @@ int br_fdb_fillbuf(struct net_bridge *br, void *buf, | |||
312 | 312 | ||
313 | fe->is_local = f->is_local; | 313 | fe->is_local = f->is_local; |
314 | if (!f->is_static) | 314 | if (!f->is_static) |
315 | fe->ageing_timer_value = jiffies_to_clock_t(jiffies - f->updated); | 315 | fe->ageing_timer_value = jiffies_delta_to_clock_t(jiffies - f->updated); |
316 | ++fe; | 316 | ++fe; |
317 | ++num; | 317 | ++num; |
318 | } | 318 | } |
diff --git a/net/bridge/br_stp_timer.c b/net/bridge/br_stp_timer.c index a6747e673426..c3530a81a33b 100644 --- a/net/bridge/br_stp_timer.c +++ b/net/bridge/br_stp_timer.c | |||
@@ -170,5 +170,5 @@ void br_stp_port_timer_init(struct net_bridge_port *p) | |||
170 | unsigned long br_timer_value(const struct timer_list *timer) | 170 | unsigned long br_timer_value(const struct timer_list *timer) |
171 | { | 171 | { |
172 | return timer_pending(timer) | 172 | return timer_pending(timer) |
173 | ? jiffies_to_clock_t(timer->expires - jiffies) : 0; | 173 | ? jiffies_delta_to_clock_t(timer->expires - jiffies) : 0; |
174 | } | 174 | } |