From d89eafa4b73acb2785fd6218fdaaf6b336ac132c Mon Sep 17 00:00:00 2001 From: David Howells Date: Mon, 21 Jul 2008 10:02:12 -0700 Subject: [PATCH] --- yaml --- r: 104489 b: refs/heads/master c: 280763c053fee297d95b474f2c145990670371e6 h: refs/heads/master i: 104487: 84bf11d023fc5a4c327f6eda3f482dc8064a5a3f v: v3 --- [refs] | 2 +- trunk/net/netfilter/xt_time.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cc26c7280393..c393ff4369fd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 584015727a3b88b46602b20077b46cd04f8b4ab3 +refs/heads/master: 280763c053fee297d95b474f2c145990670371e6 diff --git a/trunk/net/netfilter/xt_time.c b/trunk/net/netfilter/xt_time.c index ed76baab4734..9f328593287e 100644 --- a/trunk/net/netfilter/xt_time.c +++ b/trunk/net/netfilter/xt_time.c @@ -173,7 +173,7 @@ time_mt(const struct sk_buff *skb, const struct net_device *in, __net_timestamp((struct sk_buff *)skb); stamp = ktime_to_ns(skb->tstamp); - do_div(stamp, NSEC_PER_SEC); + stamp = div_s64(stamp, NSEC_PER_SEC); if (info->flags & XT_TIME_LOCAL_TZ) /* Adjust for local timezone */