---

yaml --- r: 20235 b: refs/heads/master c: 3c79192 h: refs/heads/master i: 20233: e695a20 20231: 3ff3d2c v: v3
git-mirror · Feb 13, 2006 · 66e7ac2 · 66e7ac2
1 parent 654b2b0
commit 66e7ac2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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,