[NETFILTER]: xt_time should not assume CONFIG_KTIME_SCALAR
authorEric Dumazet <dada1@cosmosbay.com>
Tue, 13 Nov 2007 11:49:53 +0000 (03:49 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 13 Nov 2007 11:49:53 +0000 (03:49 -0800)
It is not correct to assume one can get nsec from a ktime directly by
using .tv64 field.

Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/netfilter/xt_time.c

index ff44f86c24cefe4e9a613178434bb06089b9cc61..f9c55dcd894b70e9cef74203a27f2d747d4f2d8e 100644 (file)
@@ -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)