summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJesper Juhl <jesper.juhl@gmail.com>2006-02-12 14:34:53 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-12 16:10:47 -0800
commit3c791925da0e6108cda15e3c2c7bfaebcd9ab9cf (patch)
treecc931cbbe81b15687d28f774e916dd917ae0bf88 /net
parentd524c5e200486d55942fcd25b0b6e181f843f837 (diff)
downloadop-kernel-dev-3c791925da0e6108cda15e3c2c7bfaebcd9ab9cf.zip
op-kernel-dev-3c791925da0e6108cda15e3c2c7bfaebcd9ab9cf.tar.gz
[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')
-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 b501816..c06cb09 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,
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,
OpenPOWER on IntegriCloud