From: David Howells <dhowells@redhat.com>
Date: Thu, 31 Jul 2008 18:48:23 +0000 (+0200)
Subject: netfilter: xt_time: fix time's time_mt()'s use of do_div()
X-Git-Tag: v2.6.26.2~18
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1e692471cb57278d87d09530c6af4f0aaab13a79;p=platform%2Fkernel%2Flinux-stable.git

netfilter: xt_time: fix time's time_mt()'s use of do_div()

[ Upstream commit 280763c053fee297d95b474f2c145990670371e6 ]

Fix netfilter xt_time's time_mt()'s use of do_div() on an s64 by using
div_s64() instead.

This was introduced by patch ee4411a1b1e0b679c99686629b5eab5a072ce49f
("[NETFILTER]: x_tables: add xt_time match").

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
CC: Oliver Pinter <oliver.pntr@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/net/netfilter/xt_time.c b/net/netfilter/xt_time.c
index ed76baab4734..9f328593287e 100644
--- a/net/netfilter/xt_time.c
+++ b/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 */