* [patch 04/39] [PATCH] [BRIDGE]: netfilter missing symbol has_bridge_parent [not found] <20060227223200.865548000@sorel.sous-sol.org> @ 2006-02-27 22:32 ` Chris Wright 2006-02-28 2:38 ` Horms 0 siblings, 1 reply; 2+ messages in thread From: Chris Wright @ 2006-02-27 22:32 UTC (permalink / raw) To: linux-kernel, stable, Bernard Pidoux Cc: Justin Forbes, Zwane Mwaikambo, Theodore Ts'o, Randy Dunlap, Dave Jones, Chuck Wolber, torvalds, akpm, alan, Horms, wensong, netdev, ja, David S. Miller, Stephen Hemminger, Greg Kroah-Hartman [-- Attachment #1: netfilter-missing-symbol.patch --] [-- Type: text/plain, Size: 1204 bytes --] -stable review patch. If anyone has any objections, please let us know. ------------------ 5dce971acf2ae20c80d5e9d1f6bbf17376870911 in Linus' tree, otherwise known as bridge-netfilter-races-on-device-removal.patch in 2.5.15.4 removed has_bridge_parent, however this symbol is still called with NETFILTER_DEBUG is enabled. This patch uses the already seeded realoutdev value to detect if a parent exists, and if so, the value of the parent. Signed-Off-By: Horms <horms@verge.net.au> Acked-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Chris Wright <chrisw@sous-sol.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- net/bridge/br_netfilter.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- linux-2.6.15.4.orig/net/bridge/br_netfilter.c +++ linux-2.6.15.4/net/bridge/br_netfilter.c @@ -794,8 +794,8 @@ static unsigned int br_nf_post_routing(u print_error: if (skb->dev != NULL) { printk("[%s]", skb->dev->name); - if (has_bridge_parent(skb->dev)) - printk("[%s]", bridge_parent(skb->dev)->name); + if (realoutdev) + printk("[%s]", realoutdev->name); } printk(" head:%p, raw:%p, data:%p\n", skb->head, skb->mac.raw, skb->data); -- ^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [patch 04/39] [PATCH] [BRIDGE]: netfilter missing symbol has_bridge_parent 2006-02-27 22:32 ` [patch 04/39] [PATCH] [BRIDGE]: netfilter missing symbol has_bridge_parent Chris Wright @ 2006-02-28 2:38 ` Horms 0 siblings, 0 replies; 2+ messages in thread From: Horms @ 2006-02-28 2:38 UTC (permalink / raw) To: Chris Wright Cc: linux-kernel, stable, Bernard Pidoux, Justin Forbes, Zwane Mwaikambo, Theodore Ts'o, Randy Dunlap, Dave Jones, Chuck Wolber, torvalds, akpm, alan, wensong, netdev, ja, David S. Miller, Stephen Hemminger, Greg Kroah-Hartman On Mon, Feb 27, 2006 at 02:32:04PM -0800, Chris Wright wrote: > -stable review patch. If anyone has any objections, please let us know. > ------------------ > > 5dce971acf2ae20c80d5e9d1f6bbf17376870911 in Linus' tree, > otherwise known as bridge-netfilter-races-on-device-removal.patch in > 2.5.15.4 removed has_bridge_parent, however this symbol is still > called with NETFILTER_DEBUG is enabled. > > This patch uses the already seeded realoutdev value to detect if a parent > exists, and if so, the value of the parent. > > Signed-Off-By: Horms <horms@verge.net.au> > Acked-by: Stephen Hemminger <shemminger@osdl.org> > Signed-off-by: Chris Wright <chrisw@sous-sol.org> > Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> > --- > > net/bridge/br_netfilter.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > --- linux-2.6.15.4.orig/net/bridge/br_netfilter.c > +++ linux-2.6.15.4/net/bridge/br_netfilter.c > @@ -794,8 +794,8 @@ static unsigned int br_nf_post_routing(u > print_error: > if (skb->dev != NULL) { > printk("[%s]", skb->dev->name); > - if (has_bridge_parent(skb->dev)) > - printk("[%s]", bridge_parent(skb->dev)->name); > + if (realoutdev) > + printk("[%s]", realoutdev->name); > } > printk(" head:%p, raw:%p, data:%p\n", skb->head, skb->mac.raw, > skb->data); > > -- I double checked, and that is the aggregate fix that was added to Linus' tree, it should solve the problem at hand. -- Horms ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-02-28 2:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20060227223200.865548000@sorel.sous-sol.org>
2006-02-27 22:32 ` [patch 04/39] [PATCH] [BRIDGE]: netfilter missing symbol has_bridge_parent Chris Wright
2006-02-28 2:38 ` Horms
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox