[PATCH RESEND]: conntrack: kill destroy() in nf_conntrack for diet

[Yasuyuki KOZAKAI]

Hi, Patrick,

From: Patrick McHardy <kaber at trash.net>
Date: Tue, 20 Mar 2007 02:06:35 +0100

> Yasuyuki KOZAKAI wrote:
> > The destructor per conntrack is unnecessary, then this replaces it with
> > system wide destructor.
> > 
> > Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai at toshiba.co.jp>
> > ---
> >  include/linux/skbuff.h                 |    7 +------
> >  net/ipv4/netfilter/ip_conntrack_core.c |    4 +++-
> >  net/netfilter/core.c                   |   19 ++++++++++++++++++-
> >  net/netfilter/nf_conntrack_core.c      |    4 +++-
> >  4 files changed, 25 insertions(+), 9 deletions(-)
> 
> 
> Thanks Yasuyuki, but this still doesn't apply to net-2.6.22
> since ip_conntrack got removed and there are also rejects in
> net/netfilter/core.c. Please rediff against Dave's net-2.6.22
> tree, thanks.

Sorry, I didn't take care that. I've deleted ip_conntrack part and replaced
NF_CONNTRACK_ENABLED with NF_CONNTRACK.

> > The destructor per conntrack is unnecessary, then this replaces it with
> > system wide destructor.
> > 
> > +extern void (*nf_ct_destroy)(struct nf_conntrack*);
> 
> BTW, please add whitespace between nf_conntrack and * (also in some
> other spots).

Thanks for pointing out this. I've also fixed them.

-- Yasuyuki Kozakai