aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
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/ipv4
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/ipv4')
-rw-r--r--net/ipv4/ip_fragment.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index 75347ea70ea0..963c3689d0af 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -556,7 +556,6 @@ static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev,
556 556
557 skb_shinfo(head)->frag_list = head->next; 557 skb_shinfo(head)->frag_list = head->next;
558 skb_push(head, head->data - skb_network_header(head)); 558 skb_push(head, head->data - skb_network_header(head));
559 atomic_sub(head->truesize, &qp->q.net->mem);
560 559
561 for (fp=head->next; fp; fp = fp->next) { 560 for (fp=head->next; fp; fp = fp->next) {
562 head->data_len += fp->len; 561 head->data_len += fp->len;
@@ -566,8 +565,8 @@ static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev,
566 else if (head->ip_summed == CHECKSUM_COMPLETE) 565 else if (head->ip_summed == CHECKSUM_COMPLETE)
567 head->csum = csum_add(head->csum, fp->csum); 566 head->csum = csum_add(head->csum, fp->csum);
568 head->truesize += fp->truesize; 567 head->truesize += fp->truesize;
569 atomic_sub(fp->truesize, &qp->q.net->mem);
570 } 568 }
569 atomic_sub(head->truesize, &qp->q.net->mem);
571 570
572 head->next = NULL; 571 head->next = NULL;
573 head->dev = dev; 572 head->dev = dev;