Re: git-net-fixup.patch added to -mm tree
On Sun, Jul 31, 2005 at 10:12:46PM -0700, David S. Miller wrote:
> From: [EMAIL PROTECTED]
> Date: Sun, 31 Jul 2005 22:03:47 -0700
>
> > From: Andrew Morton <[EMAIL PROTECTED]>
> >
> > Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
> ...
> > /* 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_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 <[EMAIL PROTECTED]> http://gnumonks.org/
"Privacy in residential applications is a desirable marketing option."
(ETSI EN 300 175-7 Ch. A6)
pgpsXtiVh9Se7.pgp
Description: PGP signature
Re: git-net-fixup.patch added to -mm tree
From: "David S. Miller" <[EMAIL PROTECTED]> Date: Sun, 31 Jul 2005 22:25:04 -0700 (PDT) > I'll try to rebuild the net-2.6.14 tree if I get a chance before > heading off to the UK tomorrow. That should help things out for > you. Ok, I just finished doing this, it should take a while for it to show up on the mirrors. The HEAD commit is d5b351906c1aee0f906f559a46031aabfa1a8c31 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: git-net-fixup.patch added to -mm tree
From: David S. Miller [EMAIL PROTECTED] Date: Sun, 31 Jul 2005 22:25:04 -0700 (PDT) I'll try to rebuild the net-2.6.14 tree if I get a chance before heading off to the UK tomorrow. That should help things out for you. Ok, I just finished doing this, it should take a while for it to show up on the mirrors. The HEAD commit is d5b351906c1aee0f906f559a46031aabfa1a8c31 - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: git-net-fixup.patch added to -mm tree
On Sun, Jul 31, 2005 at 10:12:46PM -0700, David S. Miller wrote:
From: [EMAIL PROTECTED]
Date: Sun, 31 Jul 2005 22:03:47 -0700
From: Andrew Morton [EMAIL PROTECTED]
Signed-off-by: Andrew Morton [EMAIL PROTECTED]
...
/* 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 [EMAIL PROTECTED] http://gnumonks.org/
Privacy in residential applications is a desirable marketing option.
(ETSI EN 300 175-7 Ch. A6)
pgpsXtiVh9Se7.pgp
Description: PGP signature
Re: git-net-fixup.patch added to -mm tree
From: Andrew Morton <[EMAIL PROTECTED]> Date: Sun, 31 Jul 2005 22:21:25 -0700 > Actually, that patch is just a fixup for a patch reject from the net-2.6.14 > diff. I do that sometimes when I get sick of fixing up the same reject > each time I pull the various trees. > > (I'm not sure _why_ I'm getting a reject applying that diff. Nothing else > touches that file. git is not quite yet generating the linus->davem diff > which I want..) There is a tiny bit of conflicts between linux-2.6 and net-2.6.14, because of some bug fixes that went into Linus's tree over the past week. I'll try to rebuild the net-2.6.14 tree if I get a chance before heading off to the UK tomorrow. That should help things out for you. - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: git-net-fixup.patch added to -mm tree
"David S. Miller" <[EMAIL PROTECTED]> wrote:
>
> From: [EMAIL PROTECTED]
> Date: Sun, 31 Jul 2005 22:03:47 -0700
>
> > From: Andrew Morton <[EMAIL PROTECTED]>
> >
> > Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
> ...
> > /* 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_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
>
> Harald?
Actually, that patch is just a fixup for a patch reject from the net-2.6.14
diff. I do that sometimes when I get sick of fixing up the same reject
each time I pull the various trees.
(I'm not sure _why_ I'm getting a reject applying that diff. Nothing else
touches that file. git is not quite yet generating the linus->davem diff
which I want..)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: git-net-fixup.patch added to -mm tree
From: [EMAIL PROTECTED]
Date: Sun, 31 Jul 2005 22:03:47 -0700
> From: Andrew Morton <[EMAIL PROTECTED]>
>
> Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
...
> /* 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_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
Harald?
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: git-net-fixup.patch added to -mm tree
From: [EMAIL PROTECTED]
Date: Sun, 31 Jul 2005 22:03:47 -0700
From: Andrew Morton [EMAIL PROTECTED]
Signed-off-by: Andrew Morton [EMAIL PROTECTED]
...
/* 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
Harald?
-
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: git-net-fixup.patch added to -mm tree
David S. Miller [EMAIL PROTECTED] wrote:
From: [EMAIL PROTECTED]
Date: Sun, 31 Jul 2005 22:03:47 -0700
From: Andrew Morton [EMAIL PROTECTED]
Signed-off-by: Andrew Morton [EMAIL PROTECTED]
...
/* 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
Harald?
Actually, that patch is just a fixup for a patch reject from the net-2.6.14
diff. I do that sometimes when I get sick of fixing up the same reject
each time I pull the various trees.
(I'm not sure _why_ I'm getting a reject applying that diff. Nothing else
touches that file. git is not quite yet generating the linus-davem diff
which I want..)
-
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: git-net-fixup.patch added to -mm tree
From: Andrew Morton [EMAIL PROTECTED] Date: Sun, 31 Jul 2005 22:21:25 -0700 Actually, that patch is just a fixup for a patch reject from the net-2.6.14 diff. I do that sometimes when I get sick of fixing up the same reject each time I pull the various trees. (I'm not sure _why_ I'm getting a reject applying that diff. Nothing else touches that file. git is not quite yet generating the linus-davem diff which I want..) There is a tiny bit of conflicts between linux-2.6 and net-2.6.14, because of some bug fixes that went into Linus's tree over the past week. I'll try to rebuild the net-2.6.14 tree if I get a chance before heading off to the UK tomorrow. That should help things out for you. - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
