diff options
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 | ||