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

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

[Jesper Juhl]

Hi,

I just did an allyesconfig test build of 2.6.16-rc2-git10 and found a build
problem.

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 <jesper.juhl@gmail.com>
---

 Patch is compile tested only but should be obviously correct.

 net/bridge/br_netfilter.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- linux-2.6.16-rc2-git10/net/bridge/br_netfilter.c~	2006-02-12 03:03:29.000000000 +0100
+++ linux-2.6.16-rc2-git10/net/bridge/br_netfilter.c	2006-02-12 03:03:29.000000000 +0100
@@ -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,

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

[Harald Welte]

[-- Attachment #1: Type: text/plain, Size: 593 bytes --]

On Sun, Feb 12, 2006 at 03:20:36AM +0100, Jesper Juhl wrote:
> Hi,
> 
> I just did an allyesconfig test build of 2.6.16-rc2-git10 and found a build
> problem.

thanks, I'll push this via davem and to stable ASAP.

-- 
- Harald Welte <laforge@netfilter.org>                 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

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]