lkml.org 
[lkml]   [2006]   [Feb]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [patch 04/39] [PATCH] [BRIDGE]: netfilter missing symbol has_bridge_parent
    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
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2006-02-28 06:03    [W:3.270 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site