diff options
| author | Horms <horms@verge.net.au> | 2006-02-13 11:14:57 +0900 |
|---|---|---|
| committer | Chris Wright <chrisw@sous-sol.org> | 2006-03-01 14:36:32 -0800 |
| commit | 2c16bdb60935bebd25fbcc5787e91670c5a8a4ba (patch) | |
| tree | d16dad943c3616ad1c7f2a10095063ca521f8199 | |
| parent | bde2fcb4fcc69afb0a6ebd1d8c27a83e475480ed (diff) | |
[PATCH] 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 <horms@verge.net.au>
Acked-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | net/bridge/br_netfilter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c index 0770664216b8..2cc990103e5d 100644 --- a/net/bridge/br_netfilter.c +++ b/net/bridge/br_netfilter.c @@ -794,8 +794,8 @@ 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)) - 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); |