aboutsummaryrefslogtreecommitdiffstats
path: root/net/bridge
diff options
context:
space:
mode:
authorJesper Juhl <jesper.juhl@gmail.com>2006-02-12 17:34:53 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-12 19:10:47 -0500
commit3c791925da0e6108cda15e3c2c7bfaebcd9ab9cf (patch)
treecc931cbbe81b15687d28f774e916dd917ae0bf88 /net/bridge
parentd524c5e200486d55942fcd25b0b6e181f843f837 (diff)
[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: Jesper Juhl <jesper.juhl@gmail.com> Cc: Harald Welte <laforge@netfilter.org> Cc: "David S. Miller" <davem@davemloft.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'net/bridge')
-rw-r--r--net/bridge/br_netfilter.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index b5018166b0e5..c06cb0983530 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -805,7 +805,7 @@ static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff **pskb,
805print_error: 805print_error:
806 if (skb->dev != NULL) { 806 if (skb->dev != NULL) {
807 printk("[%s]", skb->dev->name); 807 printk("[%s]", skb->dev->name);
808 if (has_bridge_parent(skb->dev)) 808 if (bridge_parent(skb->dev))
809 printk("[%s]", bridge_parent(skb->dev)->name); 809 printk("[%s]", bridge_parent(skb->dev)->name);
810 } 810 }
811 printk(" head:%p, raw:%p, data:%p\n", skb->head, skb->mac.raw, 811 printk(" head:%p, raw:%p, data:%p\n", skb->head, skb->mac.raw,