diff options
author | Eric Dumazet <dada1@cosmosbay.com> | 2007-04-19 19:16:32 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:23:34 -0400 |
commit | b7aa0bf70c4afb9e38be25f5c0922498d0f8684c (patch) | |
tree | 4bc9d61031f4eb40d73887d6bde09e7d6bf2b259 /net/ipv6/reassembly.c | |
parent | 3927f2e8f9afa3424bb51ca81f7abac01ffd0005 (diff) |
[NET]: convert network timestamps to ktime_t
We currently use a special structure (struct skb_timeval) and plain
'struct timeval' to store packet timestamps in sk_buffs and struct
sock.
This has some drawbacks :
- Fixed resolution of micro second.
- Waste of space on 64bit platforms where sizeof(struct timeval)=16
I suggest using ktime_t that is a nice abstraction of high resolution
time services, currently capable of nanosecond resolution.
As sizeof(ktime_t) is 8 bytes, using ktime_t in 'struct sock' permits
a 8 byte shrink of this structure on 64bit architectures. Some other
structures also benefit from this size reduction (struct ipq in
ipv4/ip_fragment.c, struct frag_queue in ipv6/reassembly.c, ...)
Once this ktime infrastructure adopted, we can more easily provide
nanosecond resolution on top of it. (ioctl SIOCGSTAMPNS and/or
SO_TIMESTAMPNS/SCM_TIMESTAMPNS)
Note : this patch includes a bug correction in
compat_sock_get_timestamp() where a "err = 0;" was missing (so this
syscall returned -ENOENT instead of 0)
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
CC: Stephen Hemminger <shemminger@linux-foundation.org>
CC: John find <linux.kernel@free.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/reassembly.c')
-rw-r--r-- | net/ipv6/reassembly.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c index 7034c54e5010..1dde449379fb 100644 --- a/net/ipv6/reassembly.c +++ b/net/ipv6/reassembly.c | |||
@@ -88,7 +88,7 @@ struct frag_queue | |||
88 | int len; | 88 | int len; |
89 | int meat; | 89 | int meat; |
90 | int iif; | 90 | int iif; |
91 | struct timeval stamp; | 91 | ktime_t stamp; |
92 | unsigned int csum; | 92 | unsigned int csum; |
93 | __u8 last_in; /* has first/last segment arrived? */ | 93 | __u8 last_in; /* has first/last segment arrived? */ |
94 | #define COMPLETE 4 | 94 | #define COMPLETE 4 |
@@ -562,7 +562,7 @@ static void ip6_frag_queue(struct frag_queue *fq, struct sk_buff *skb, | |||
562 | if (skb->dev) | 562 | if (skb->dev) |
563 | fq->iif = skb->dev->ifindex; | 563 | fq->iif = skb->dev->ifindex; |
564 | skb->dev = NULL; | 564 | skb->dev = NULL; |
565 | skb_get_timestamp(skb, &fq->stamp); | 565 | fq->stamp = skb->tstamp; |
566 | fq->meat += skb->len; | 566 | fq->meat += skb->len; |
567 | atomic_add(skb->truesize, &ip6_frag_mem); | 567 | atomic_add(skb->truesize, &ip6_frag_mem); |
568 | 568 | ||
@@ -663,7 +663,7 @@ static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff **skb_in, | |||
663 | 663 | ||
664 | head->next = NULL; | 664 | head->next = NULL; |
665 | head->dev = dev; | 665 | head->dev = dev; |
666 | skb_set_timestamp(head, &fq->stamp); | 666 | head->tstamp = fq->stamp; |
667 | head->nh.ipv6h->payload_len = htons(payload_len); | 667 | head->nh.ipv6h->payload_len = htons(payload_len); |
668 | IP6CB(head)->nhoff = nhoff; | 668 | IP6CB(head)->nhoff = nhoff; |
669 | 669 | ||