Commit 178a3259 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller

[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: default avatarStephen Hemminger <shemminger@osdl.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a6c1cd57
...@@ -805,8 +805,8 @@ static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff **pskb, ...@@ -805,8 +805,8 @@ static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff **pskb,
print_error: print_error:
if (skb->dev != NULL) { if (skb->dev != NULL) {
printk("[%s]", skb->dev->name); printk("[%s]", skb->dev->name);
if (bridge_parent(skb->dev)) if (realoutdev)
printk("[%s]", bridge_parent(skb->dev)->name); printk("[%s]", realoutdev->name);
} }
printk(" head:%p, raw:%p, data:%p\n", skb->head, skb->mac.raw, printk(" head:%p, raw:%p, data:%p\n", skb->head, skb->mac.raw,
skb->data); skb->data);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment