aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2010-06-13 19:02:24 -0400
committerDavid S. Miller <davem@davemloft.net>2010-06-15 21:12:44 -0400
commitd27f9b35827ec91d71d3561c127a0a8135fb470d (patch)
treea6a9c67628bf3b807d8bf24375fe6c075b25af32 /net/ipv6
parent2bbdf389a9432270147c8e8e35b021ad61772f65 (diff)
ip_frag: Remove some atomic ops
Instead of doing one atomic operation per frag, we can factorize them. Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/reassembly.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index 6d4292ff5854..a630506151c3 100644
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@ -524,7 +524,6 @@ static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev,
524 skb_shinfo(head)->frag_list = head->next; 524 skb_shinfo(head)->frag_list = head->next;
525 skb_reset_transport_header(head); 525 skb_reset_transport_header(head);
526 skb_push(head, head->data - skb_network_header(head)); 526 skb_push(head, head->data - skb_network_header(head));
527 atomic_sub(head->truesize, &fq->q.net->mem);
528 527
529 for (fp=head->next; fp; fp = fp->next) { 528 for (fp=head->next; fp; fp = fp->next) {
530 head->data_len += fp->len; 529 head->data_len += fp->len;
@@ -534,8 +533,8 @@ static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev,
534 else if (head->ip_summed == CHECKSUM_COMPLETE) 533 else if (head->ip_summed == CHECKSUM_COMPLETE)
535 head->csum = csum_add(head->csum, fp->csum); 534 head->csum = csum_add(head->csum, fp->csum);
536 head->truesize += fp->truesize; 535 head->truesize += fp->truesize;
537 atomic_sub(fp->truesize, &fq->q.net->mem);
538 } 536 }
537 atomic_sub(head->truesize, &fq->q.net->mem);
539 538
540 head->next = NULL; 539 head->next = NULL;
541 head->dev = dev; 540 head->dev = dev;