From c83ba1fb2371df330fb96fd76a522ef6316b2ca3 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Tue, 13 Nov 2007 03:49:53 -0800 Subject: [PATCH] --- yaml --- r: 73625 b: refs/heads/master c: 53756524e42a71011f5ae6410d6ac386bf3a9e7b h: refs/heads/master i: 73623: 465bb0e1ecc97b8ccc0adb4732cb5167e41dd01c 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 0f4f2a74178c..95d2c5a469f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 022cbae611a37eda80d498f8f379794c8ac3be47 +refs/heads/master: 53756524e42a71011f5ae6410d6ac386bf3a9e7b diff --git a/trunk/net/netfilter/xt_time.c b/trunk/net/netfilter/xt_time.c index ff44f86c24ce..f9c55dcd894b 100644 --- a/trunk/net/netfilter/xt_time.c +++ b/trunk/net/netfilter/xt_time.c @@ -170,7 +170,7 @@ static bool xt_time_match(const struct sk_buff *skb, if (skb->tstamp.tv64 == 0) __net_timestamp((struct sk_buff *)skb); - stamp = skb->tstamp.tv64; + stamp = ktime_to_ns(skb->tstamp); do_div(stamp, NSEC_PER_SEC); if (info->flags & XT_TIME_LOCAL_TZ)