lkml.org 
[lkml]   [2006]   [Feb]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] [2.6.15.4] Fix has_bridge_parent undefined with CONFIG_NETFILTER_DEBUG
    Date
    -----BEGIN PGP SIGNED MESSAGE-----
    Hash: SHA1

    Apparently introduced in the latest stable set; I am not sure if this is a
    right fix but given that bridge parent already exists at this point it was
    rather silly to fetch it again.

    - -regards

    - -andrey

    Subject: [PATCH] [2.6.15.4] Fix has_bridge_parent undefined with
    CONFIG_NETFILTER_DEBUG

    This changes br_nf_post_routing to use realoutdev in debug print. At this
    time it is equal to bridge_parent and is guaranteed to be not NULL.

    Signed-off-by: Andrey Borzenkov <arvidjaar@mail.ru>


    - ---

    net/bridge/br_netfilter.c | 4 +---
    1 files changed, 1 insertions(+), 3 deletions(-)

    db15f4ffe50096ba1585cfa344a440626724cfda
    diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
    index 0770664..37e085b 100644
    - --- a/net/bridge/br_netfilter.c
    +++ b/net/bridge/br_netfilter.c
    @@ -793,9 +793,7 @@ static unsigned int br_nf_post_routing(u
    #ifdef CONFIG_NETFILTER_DEBUG
    print_error:
    if (skb->dev != NULL) {
    - - printk("[%s]", skb->dev->name);
    - - if (has_bridge_parent(skb->dev))
    - - printk("[%s]", bridge_parent(skb->dev)->name);
    + printk("[%s][%s]", skb->dev->name, realoutdev->name);
    }
    printk(" head:%p, raw:%p, data:%p\n", skb->head, skb->mac.raw,
    skb->data);
    - --
    1.1.6
    -----BEGIN PGP SIGNATURE-----
    Version: GnuPG v1.4.2 (GNU/Linux)
    iD8DBQFD7edzR6LMutpd94wRAngvAJsGuZqITozDySJ1UOHH2fs9zkoRMACfXT19
    RvWlH+TGksJk+hDU9d2pR+o=
    =yXVz
    -----END PGP SIGNATURE-----
    -
    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-11 14:35    [W:0.036 / U:62.648 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site