From: Stephen Hemminger <shemminger@osdl.org>
Date: Mon, 13 Feb 2006 23:43:58 +0000 (-0800)
Subject: [BRIDGE]: Better fix for netfilter missing symbol has_bridge_parent
X-Git-Tag: v2.6.16-rc4~109
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=178a3259f2508e786fb1bd6538365a167cee35c1;p=linux-2.6

[BRIDGE]: Better fix for netfilter missing symbol has_bridge_parent

Horms patch was the best of the three fixes. Dave, already applied
Harald's version, so this patch converts that to the better one.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index c06cb09835..6bb0c7eb1e 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -805,8 +805,8 @@ 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 (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);