Commit 3c791925 authored by Jesper Juhl's avatar Jesper Juhl Committed by Linus Torvalds

[PATCH] netfilter: fix build error due to missing has_bridge_parent macro

net/bridge/br_netfilter.c: In function `br_nf_post_routing':
net/bridge/br_netfilter.c:808: warning: implicit declaration of function `has_bridge_parent'
Signed-off-by: default avatarJesper Juhl <jesper.juhl@gmail.com>
Cc: Harald Welte <laforge@netfilter.org>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d524c5e2
...@@ -805,7 +805,7 @@ static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff **pskb, ...@@ -805,7 +805,7 @@ 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 (has_bridge_parent(skb->dev)) if (bridge_parent(skb->dev))
printk("[%s]", bridge_parent(skb->dev)->name); printk("[%s]", bridge_parent(skb->dev)->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,
......
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