[NETFILTER] bridge: fix link error with recent netfilter-bridge change
commit 5dce971acf2ae20c80d5e9d1f6bbf17376870911 removed the
"has_bridge_parent" macro from net/bridge/br_netfilter.c, resulting in the
following warning at compile time:
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'
and this error at link time:
net/built-in.o(.text+0xeae28): In function `br_nf_post_routing':
net/bridge/br_netfilter.c:808: undefined reference to `has_bridge_parent'
make: *** [.tmp_vmlinux1] Error 1
The patch below fixes the problem.
Signed-off-by: Jesper Juhl <[EMAIL PROTECTED]>
Signed-off-by: Harald Welte <[EMAIL PROTECTED]>
---
commit d63ec539a20c35537c930ebadeac0f58bccee86f
tree 65a56c18c840f137bf1c2f778af6afba215d143e
parent de7cdf0307f39c1399922431144d2dc8f327ee42
author Jesper Juhl <[EMAIL PROTECTED]> Sun, 12 Feb 2006 12:35:40 +0100
committer Harald Welte <[EMAIL PROTECTED]> Sun, 12 Feb 2006 12:35:40 +0100
net/bridge/br_netfilter.c | 2 +-
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(u
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,
--
- Harald Welte <[EMAIL PROTECTED]> http://netfilter.org/
============================================================================
"Fragmentation is like classful addressing -- an interesting early
architectural error that shows how much experimentation was going
on while IP was being designed." -- Paul Vixie
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
