Skip to contentSkip to conversation

netfilter: fix build error due to missing has_bridge_parent macro

PATCH In review Jesper Juhl 2 participants 2 messages Feb 12, 2006

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 netfilter: fix build error due to missing has_bridge_parent macro

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.

---

Patch is compile tested only but should be obviously correct.

 net/bridge/br_netfilter.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)
net/bridge/br_netfilter.c renamed from net/bridge/br_netfilter.c~ +1 -1
@@ -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,
#1 lore raw
Quoted 4 lines · Jesper Juhl

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.

Signature · 5 lines
- 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