Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=53756524e42a71011f5ae6410d6ac386bf3a9e7b Commit: 53756524e42a71011f5ae6410d6ac386bf3a9e7b Parent: 022cbae611a37eda80d498f8f379794c8ac3be47 Author: Eric Dumazet <[EMAIL PROTECTED]> AuthorDate: Tue Nov 13 03:49:53 2007 -0800 Committer: David S. Miller <[EMAIL PROTECTED]> CommitDate: Tue Nov 13 03:49:53 2007 -0800
[NETFILTER]: xt_time should not assume CONFIG_KTIME_SCALAR It is not correct to assume one can get nsec from a ktime directly by using .tv64 field. Signed-off-by: Eric Dumazet <[EMAIL PROTECTED]> Signed-off-by: David S. Miller <[EMAIL PROTECTED]> --- net/netfilter/xt_time.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/netfilter/xt_time.c b/net/netfilter/xt_time.c index ff44f86..f9c55dc 100644 --- a/net/netfilter/xt_time.c +++ b/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) - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html