diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-01 18:02:27 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-01 18:02:27 -0400 |
| commit | ceeec3dc375e3b0618f16b34efc56fe093918f8b (patch) | |
| tree | 2293d02721ee05131aaf1c60e4fba7e281585eec /net/ipv6/reassembly.c | |
| parent | fbff868db3a4cc6a89d51da9a6d49b26c29d04fb (diff) | |
| parent | e3ee3b78f83688a0ae4315e8be71b2eac559904a (diff) | |
/spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'net/ipv6/reassembly.c')
| -rw-r--r-- | net/ipv6/reassembly.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c index 59e7c6317872..9d9e04344c77 100644 --- a/net/ipv6/reassembly.c +++ b/net/ipv6/reassembly.c | |||
| @@ -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 | fq->stamp = skb->stamp; | 565 | skb_get_timestamp(skb, &fq->stamp); |
| 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 | ||
| @@ -664,7 +664,7 @@ static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff **skb_in, | |||
| 664 | 664 | ||
| 665 | head->next = NULL; | 665 | head->next = NULL; |
| 666 | head->dev = dev; | 666 | head->dev = dev; |
| 667 | head->stamp = fq->stamp; | 667 | skb_set_timestamp(head, &fq->stamp); |
| 668 | head->nh.ipv6h->payload_len = htons(payload_len); | 668 | head->nh.ipv6h->payload_len = htons(payload_len); |
| 669 | 669 | ||
| 670 | *skb_in = head; | 670 | *skb_in = head; |