From 79761c649bbf0c464ab099140faeba157734d5fd Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 3 Jun 2008 16:03:15 -0700 Subject: [PATCH] --- yaml --- r: 97634 b: refs/heads/master c: b9f5f52cca3e94f1e7509f366aa250ebbe1ed0b5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/core/neighbour.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 856d0654fafe..a572ca90eb9f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 57c511d8d47caeeae375cb8106662c0bd6a7e7e0 +refs/heads/master: b9f5f52cca3e94f1e7509f366aa250ebbe1ed0b5 diff --git a/trunk/net/core/neighbour.c b/trunk/net/core/neighbour.c index 5d9d7130bd6e..3896de79dfbf 100644 --- a/trunk/net/core/neighbour.c +++ b/trunk/net/core/neighbour.c @@ -2057,9 +2057,9 @@ static int neigh_fill_info(struct sk_buff *skb, struct neighbour *neigh, goto nla_put_failure; } - ci.ndm_used = now - neigh->used; - ci.ndm_confirmed = now - neigh->confirmed; - ci.ndm_updated = now - neigh->updated; + ci.ndm_used = jiffies_to_clock_t(now - neigh->used); + ci.ndm_confirmed = jiffies_to_clock_t(now - neigh->confirmed); + ci.ndm_updated = jiffies_to_clock_t(now - neigh->updated); ci.ndm_refcnt = atomic_read(&neigh->refcnt) - 1; read_unlock_bh(&neigh->lock);