From 281f0db3b1a8137a0c6b49771e40b5a9c35968d5 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 13 Feb 2006 11:18:23 -0800 Subject: [PATCH] Compile fix for netfilter bridge fix with CONFIG_NETFILTER_DEBUG, from Horms, Steve picked up same for upstream. --- queue/netfilter-missing-symbol.patch | 54 ++++++++++++++++++++++++++++ queue/series | 1 + 2 files changed, 55 insertions(+) create mode 100644 queue/netfilter-missing-symbol.patch diff --git a/queue/netfilter-missing-symbol.patch b/queue/netfilter-missing-symbol.patch new file mode 100644 index 00000000000..80eb6295708 --- /dev/null +++ b/queue/netfilter-missing-symbol.patch @@ -0,0 +1,54 @@ +From stable-bounces@linux.kernel.org Sun Feb 12 18:18:07 2006 +Date: Mon, 13 Feb 2006 11:14:57 +0900 +From: Horms +To: Bernard Pidoux +Cc: wensong@linux-vs.org, netdev@vger.kernel.org, stable@kernel.org, ja@ssi.bg, + "David S. Miller" , + Stephen Hemminger +Subject: [stable] [PATCH] [BRIDGE]: netfilter missing symbol + has_bridge_parent + +On Sun, Feb 12, 2006 at 11:15:42PM +0100, Bernard Pidoux wrote: +> Hi, +> +> I would like to report that when compiling 2.6.15.4 kernel +> there is an error with undefined symbol 'has_bridge_parent' +> in compilation of bridge/br_netfilter.c +> due to CONFIG_NETFILTER_DEBUG 1 option. + +I think that the following patch will resolve this problem. + +-- +Horms + +[BRIDGE]: netfilter missing symbol has_bridge_parent + +5dce971acf2ae20c80d5e9d1f6bbf17376870911 in Linus' tree, +otherwise known as bridge-netfilter-races-on-device-removal.patch in +2.5.15.4 removed has_bridge_parent, however this symbol is still +called with NETFILTER_DEBUG is enabled. + +This patch uses the already seeded realoutdev value to detect if a parent +exists, and if so, the value of the parent. + +Signed-Off-By: Horms +Acked-by: Stephen Hemminger +Signed-off-by: Chris Wright +--- + + net/bridge/br_netfilter.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +--- linux-2.6.15.4.orig/net/bridge/br_netfilter.c ++++ linux-2.6.15.4/net/bridge/br_netfilter.c +@@ -794,8 +794,8 @@ 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)) +- printk("[%s]", bridge_parent(skb->dev)->name); ++ if (realoutdev) ++ printk("[%s]", realoutdev->name); + } + printk(" head:%p, raw:%p, data:%p\n", skb->head, skb->mac.raw, + skb->data); diff --git a/queue/series b/queue/series index ec40dc81992..902531cda5f 100644 --- a/queue/series +++ b/queue/series @@ -1,3 +1,4 @@ ppc32-put-cache-flush-routines-back-into-.relocate_code-section.patch s390-klibc-build-fix-for-2.6.15.patch shmdt-cannot-detach-not-alined-shm-segment-cleanly.patch +netfilter-missing-symbol.patch -- 2.47.3