OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
022cbae
)
[NETFILTER]: xt_time should not assume CONFIG_KTIME_SCALAR
author
Eric Dumazet
<dada1@cosmosbay.com>
Tue, 13 Nov 2007 11:49:53 +0000
(
03:49
-0800)
committer
David 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
patch
|
blob
|
history
diff --git
a/net/netfilter/xt_time.c
b/net/netfilter/xt_time.c
index
ff44f86
..
f9c55dc
100644
(file)
--- 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)