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 */