diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2007-10-18 06:48:26 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-10-18 06:48:26 +0400 |
| commit | c95477090a2ace6d241c184adc3fbfcab9c61ceb (patch) | |
| tree | 78c43a301f18f4ad4486a48227a9ca45239208f3 /net/ipv6/reassembly.c | |
| parent | 48d60056387c37a17a46feda48613587a90535e5 (diff) | |
| download | linux-c95477090a2ace6d241c184adc3fbfcab9c61ceb.tar.xz | |
[INET]: Consolidate frag queues freeing
Since we now allocate the queues in inet_fragment.c, we
can safely free it in the same place. The ->destructor
callback thus becomes optional for inet_frags.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/reassembly.c')
| -rw-r--r-- | net/ipv6/reassembly.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c index 01766bc75b6a..76c88a93b9b5 100644 --- a/net/ipv6/reassembly.c +++ b/net/ipv6/reassembly.c @@ -175,11 +175,6 @@ void ip6_frag_init(struct inet_frag_queue *q, void *a) } EXPORT_SYMBOL(ip6_frag_init); -static void ip6_frag_free(struct inet_frag_queue *fq) -{ - kfree(container_of(fq, struct frag_queue, q)); -} - /* Destruction primitives. */ static __inline__ void fq_put(struct frag_queue *fq) @@ -645,7 +640,7 @@ void __init ipv6_frag_init(void) ip6_frags.ctl = &ip6_frags_ctl; ip6_frags.hashfn = ip6_hashfn; ip6_frags.constructor = ip6_frag_init; - ip6_frags.destructor = ip6_frag_free; + ip6_frags.destructor = NULL; ip6_frags.skb_free = NULL; ip6_frags.qsize = sizeof(struct frag_queue); ip6_frags.match = ip6_frag_match; |