From 66e7ac2b0d0a14a03d5c8590cb1f68354f3dbb7a Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Sun, 12 Feb 2006 14:34:53 -0800 Subject: [PATCH] --- yaml --- r: 20235 b: refs/heads/master c: 3c791925da0e6108cda15e3c2c7bfaebcd9ab9cf h: refs/heads/master i: 20233: e695a20fdff0740881b32a92bca7b495a9f79f60 20231: 3ff3d2c172a0b88ddf3f71e96b83bfe89231de1a v: v3 --- [refs] | 2 +- trunk/net/bridge/br_netfilter.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2fd58f68695c..b9fcb79517df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d524c5e200486d55942fcd25b0b6e181f843f837 +refs/heads/master: 3c791925da0e6108cda15e3c2c7bfaebcd9ab9cf diff --git a/trunk/net/bridge/br_netfilter.c b/trunk/net/bridge/br_netfilter.c index b5018166b0e5..c06cb0983530 100644 --- a/trunk/net/bridge/br_netfilter.c +++ b/trunk/net/bridge/br_netfilter.c @@ -805,7 +805,7 @@ static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff **pskb, print_error: if (skb->dev != NULL) { printk("[%s]", skb->dev->name); - if (has_bridge_parent(skb->dev)) + if (bridge_parent(skb->dev)) printk("[%s]", bridge_parent(skb->dev)->name); } printk(" head:%p, raw:%p, data:%p\n", skb->head, skb->mac.raw,