| From stable-bounces@linux.kernel.org Thu Nov 16 21:40:53 2006 |
| From: Patrick McHardy <kaber@trash.net> |
| To: stable@kernel.org |
| Message-Id: <20061117053549.10231.57261.sendpatchset@localhost.localdomain> |
| Date: Fri, 17 Nov 2006 06:35:49 +0100 (MET) |
| Cc: Patrick McHardy <kaber@trash.net>, davem@davemloft.net |
| Subject: NETFILTER: Kconfig: fix xt_physdev dependencies |
| |
| xt_physdev depends on bridge netfilter, which is a boolean, but can still |
| be built modular because of special handling in the bridge makefile. Add |
| a dependency on BRIDGE to prevent XT_MATCH_PHYSDEV=y, BRIDGE=m. |
| |
| Signed-off-by: Patrick McHardy <kaber@trash.net> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Chris Wright <chrisw@sous-sol.org> |
| |
| --- |
| commit ca6adddd237afa4910bab5e9e8ba0685f37c2bfe |
| tree 45c88fae3ec75a90ffac423906e662bdb36e8251 |
| parent cf08e74a590c945d3c0b95886ea3fad8ff73793d |
| author Patrick McHardy <kaber@trash.net> Fri, 17 Nov 2006 06:25:31 +0100 |
| committer Patrick McHardy <kaber@trash.net> Fri, 17 Nov 2006 06:25:31 +0100 |
| |
| net/netfilter/Kconfig | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- linux-2.6.18.4.orig/net/netfilter/Kconfig |
| +++ linux-2.6.18.4/net/netfilter/Kconfig |
| @@ -342,7 +342,7 @@ config NETFILTER_XT_MATCH_MULTIPORT |
| |
| config NETFILTER_XT_MATCH_PHYSDEV |
| tristate '"physdev" match support' |
| - depends on NETFILTER_XTABLES && BRIDGE_NETFILTER |
| + depends on NETFILTER_XTABLES && BRIDGE && BRIDGE_NETFILTER |
| help |
| Physdev packet matching matches against the physical bridge ports |
| the IP packet arrived on or will leave by. |
