lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[INET]: Consolidate xxx_frag_create()

Browse Source 
This one uses the xxx_frag_intern() and xxx_frag_alloc()
routines, which are already consolidated, so remove them
from protocol code (as promised).

The ->constructor callback is used to init the rest of
the frag queue and it is the same for netfilter and ipv6.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Pavel Emelyanov
2007-10-17 19:46:47 -07:00
committed by David S. Miller
parent e521db9d79
commit c6fda28229
6 changed files with 89 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
net/ipv6/netfilter/nf_conntrack_reasm.c
View File

@@ -135,14 +135,6 @@ static void nf_frag_free(struct inet_frag_queue *q)
kfree(container_of(q, struct nf_ct_frag6_queue, q));
}
static inline struct nf_ct_frag6_queue *frag_alloc_queue(void)
{
struct inet_frag_queue *q;
q = inet_frag_alloc(&nf_frags);
return q ? container_of(q, struct nf_ct_frag6_queue, q) : NULL;
}
/* Destruction primitives. */
static __inline__ void fq_put(struct nf_ct_frag6_queue *fq)
@@ -184,33 +176,25 @@ out:
/* Creation primitives. */
static struct nf_ct_frag6_queue *nf_ct_frag6_intern(unsigned int hash,
struct nf_ct_frag6_queue *fq_in)
static struct nf_ct_frag6_queue *
nf_ct_frag6_create(unsigned int hash, __be32 id, struct in6_addr *src,
struct in6_addr *dst)
{
struct inet_frag_queue *q;
struct ip6_create_arg arg;
q = inet_frag_intern(&fq_in->q, &nf_frags, hash);
return container_of(q, struct nf_ct_frag6_queue, q);
}
arg.id = id;
arg.src = src;
arg.dst = dst;
static struct nf_ct_frag6_queue *
nf_ct_frag6_create(unsigned int hash, __be32 id, struct in6_addr *src, struct in6_addr *dst)
{
struct nf_ct_frag6_queue *fq;
if ((fq = frag_alloc_queue()) == NULL) {
pr_debug("Can't alloc new queue\n");
q = inet_frag_create(&nf_frags, &arg, hash);
if (q == NULL)
goto oom;
}
fq->id = id;
ipv6_addr_copy(&fq->saddr, src);
ipv6_addr_copy(&fq->daddr, dst);
return nf_ct_frag6_intern(hash, fq);
return container_of(q, struct nf_ct_frag6_queue, q);
oom:
pr_debug("Can't alloc new queue\n");
return NULL;
}
@@ -718,6 +702,7 @@ int nf_ct_frag6_init(void)
{
nf_frags.ctl = &nf_frags_ctl;
nf_frags.hashfn = nf_hashfn;
nf_frags.constructor = ip6_frag_init;
nf_frags.destructor = nf_frag_free;
nf_frags.skb_free = nf_skb_free;
nf_frags.qsize = sizeof(struct nf_ct_frag6_queue);