Re: git-net-fixup.patch added to -mm tree

From: Harald Welte
Date: Mon Aug 01 2005 - 01:43:18 EST


On Sun, Jul 31, 2005 at 10:12:46PM -0700, David S. Miller wrote:
> From: akpm@xxxxxxxx
> Date: Sun, 31 Jul 2005 22:03:47 -0700
>
> > From: Andrew Morton <akpm@xxxxxxxx>
> >
> > Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
> ...
> > /* decrement reference count on a conntrack */
> > -extern void ip_conntrack_put(struct ip_conntrack *ct);
> > +static inline void
> > +ip_conntrack_put(struct ip_conntrack *ct)
> > +{
> > + IP_NF_ASSERT(ct);
> > + nf_conntrack_put(&ct->ct_general);
> > +}
>
> You can instead just kill the EXPORT_SYMBOL_GPL() in
> ip_conntrack_standalone.c as that's the only reference outside of
> ip_conntrack_core.c

for 2.6.13 this should work. net-2.6.14 contains
ip_conntrack_netlink.c, which needs ip_conntrakc_put (and therefore the
EXPORT_SYMBOL_GPL().

We also have other code out-of-tree (e.g. ct_sync) that need the symbo.
I know this is no rectification, but I'm merely mentioning it JFYI.

--
- Harald Welte <laforge@xxxxxxxxxxxx> http://gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
(ETSI EN 300 175-7 Ch. A6)

Attachment: pgp00000.pgp
Description: PGP signature