diff options
author | Florian Westphal <fw@strlen.de> | 2015-07-23 06:05:38 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-07-27 00:00:14 -0400 |
commit | 0e60d245a0be7fdbb723607f1d6621007916b252 (patch) | |
tree | d9e4326a5b709d2fd069128f1c6ec46ff56e0ebb /net/ipv6/reassembly.c | |
parent | d1fe19444d82e399e38c1594c71b850eca8e9de0 (diff) |
inet: frag: change *_frag_mem_limit functions to take netns_frags as argument
Followup patch will call it after inet_frag_queue was freed, so q->net
doesn't work anymore (but netf = q->net; free(q); mem_limit(netf) would).
Tested-by: Frank Schreuder <fschreuder@transip.nl>
Signed-off-by: Florian Westphal <fw@strlen.de>
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 8ffa2c8cce77..5c3bbca6a150 100644 --- a/net/ipv6/reassembly.c +++ b/net/ipv6/reassembly.c | |||
@@ -330,7 +330,7 @@ found: | |||
330 | fq->q.stamp = skb->tstamp; | 330 | fq->q.stamp = skb->tstamp; |
331 | fq->q.meat += skb->len; | 331 | fq->q.meat += skb->len; |
332 | fq->ecn |= ecn; | 332 | fq->ecn |= ecn; |
333 | add_frag_mem_limit(&fq->q, skb->truesize); | 333 | add_frag_mem_limit(fq->q.net, skb->truesize); |
334 | 334 | ||
335 | /* The first fragment. | 335 | /* The first fragment. |
336 | * nhoffset is obtained from the first fragment, of course. | 336 | * nhoffset is obtained from the first fragment, of course. |
@@ -443,7 +443,7 @@ static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev, | |||
443 | head->len -= clone->len; | 443 | head->len -= clone->len; |
444 | clone->csum = 0; | 444 | clone->csum = 0; |
445 | clone->ip_summed = head->ip_summed; | 445 | clone->ip_summed = head->ip_summed; |
446 | add_frag_mem_limit(&fq->q, clone->truesize); | 446 | add_frag_mem_limit(fq->q.net, clone->truesize); |
447 | } | 447 | } |
448 | 448 | ||
449 | /* We have to remove fragment header from datagram and to relocate | 449 | /* We have to remove fragment header from datagram and to relocate |
@@ -481,7 +481,7 @@ static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev, | |||
481 | } | 481 | } |
482 | fp = next; | 482 | fp = next; |
483 | } | 483 | } |
484 | sub_frag_mem_limit(&fq->q, sum_truesize); | 484 | sub_frag_mem_limit(fq->q.net, sum_truesize); |
485 | 485 | ||
486 | head->next = NULL; | 486 | head->next = NULL; |
487 | head->dev = dev; | 487 | head->dev = dev; |