/[linux-patches]/genpatches-2.6/trunk/2.6.14/1436_15.5_netfilter-has_bridge_parent.patch
Gentoo

Contents of /genpatches-2.6/trunk/2.6.14/1436_15.5_netfilter-has_bridge_parent.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 328 - (show annotations) (download) (as text)
Tue Mar 14 13:34:17 2006 UTC (14 years, 7 months ago) by johnm
File MIME type: text/x-diff
File size: 1317 byte(s)
2.6.14-11, rebase against local tree
1 From: Horms <horms@verge.net.au>
2 Date: Mon, 13 Feb 2006 02:14:57 +0000 (+0900)
3 Subject: [PATCH] netfilter missing symbol has_bridge_parent
4 X-Git-Url: http://www.kernel.org/git/?p=linux/kernel/git/chrisw/linux-2.6.15.y.git;a=commitdiff;h=2c16bdb60935bebd25fbcc5787e91670c5a8a4ba
5
6 [PATCH] netfilter missing symbol has_bridge_parent
7
8 5dce971acf2ae20c80d5e9d1f6bbf17376870911 in Linus' tree,
9 otherwise known as bridge-netfilter-races-on-device-removal.patch in
10 2.5.15.4 removed has_bridge_parent, however this symbol is still
11 called with NETFILTER_DEBUG is enabled.
12
13 This patch uses the already seeded realoutdev value to detect if a parent
14 exists, and if so, the value of the parent.
15
16 Signed-Off-By: Horms <horms@verge.net.au>
17 Acked-by: Stephen Hemminger <shemminger@osdl.org>
18 Signed-off-by: Chris Wright <chrisw@sous-sol.org>
19 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
20 ---
21
22 --- a/net/bridge/br_netfilter.c
23 +++ b/net/bridge/br_netfilter.c
24 @@ -794,8 +794,8 @@ static unsigned int br_nf_post_routing(u
25 print_error:
26 if (skb->dev != NULL) {
27 printk("[%s]", skb->dev->name);
28 - if (has_bridge_parent(skb->dev))
29 - printk("[%s]", bridge_parent(skb->dev)->name);
30 + if (realoutdev)
31 + printk("[%s]", realoutdev->name);
32 }
33 printk(" head:%p, raw:%p, data:%p\n", skb->head, skb->mac.raw,
34 skb->data);

  ViewVC Help
Powered by ViewVC 1.1.20