]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
[INET]: Move common fields from frag_queues in one place.
authorPavel Emelyanov <xemul@openvz.org>
Mon, 15 Oct 2007 09:24:19 +0000 (02:24 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Mon, 15 Oct 2007 19:26:38 +0000 (12:26 -0700)
commit5ab11c98d3a950faf6922b6166e5f8fc874590e7
treeef9ab897361f106309df37b6d4f2e95fdecdb240
parent114342f2d38439cb1a54f1f724fa38729b093c48
[INET]: Move common fields from frag_queues in one place.

Introduce the struct inet_frag_queue in include/net/inet_frag.h
file and place there all the common fields from three structs:

 * struct ipq in ipv4/ip_fragment.c
 * struct nf_ct_frag6_queue in nf_conntrack_reasm.c
 * struct frag_queue in ipv6/reassembly.c

After this, replace these fields on appropriate structures with
this structure instance and fix the users to use correct names
i.e. hunks like

-    atomic_dec(&fq->refcnt);
+    atomic_dec(&fq->q.refcnt);

(these occupy most of the patch)

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/inet_frag.h [new file with mode: 0644]
net/ipv4/ip_fragment.c
net/ipv6/netfilter/nf_conntrack_reasm.c
net/ipv6/reassembly.c