diff options
| author | David Howells <dhowells@redhat.com> | 2006-12-05 09:37:56 -0500 |
|---|---|---|
| committer | David Howells <dhowells@warthog.cambridge.redhat.com> | 2006-12-05 09:37:56 -0500 |
| commit | 4c1ac1b49122b805adfa4efc620592f68dccf5db (patch) | |
| tree | 87557f4bc2fd4fe65b7570489c2f610c45c0adcd /net/ipv6/Kconfig | |
| parent | c4028958b6ecad064b1a6303a6a5906d4fe48d73 (diff) | |
| parent | d916faace3efc0bf19fe9a615a1ab8fa1a24cd93 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/infiniband/core/iwcm.c
drivers/net/chelsio/cxgb2.c
drivers/net/wireless/bcm43xx/bcm43xx_main.c
drivers/net/wireless/prism54/islpci_eth.c
drivers/usb/core/hub.h
drivers/usb/input/hid-core.c
net/core/netpoll.c
Fix up merge failures with Linus's head and fix new compilation failures.
Signed-Off-By: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/ipv6/Kconfig')
| -rw-r--r-- | net/ipv6/Kconfig | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig index 6e48f52e197c..deb4101a2a81 100644 --- a/net/ipv6/Kconfig +++ b/net/ipv6/Kconfig | |||
| @@ -196,10 +196,3 @@ config IPV6_SUBTREES | |||
| 196 | 196 | ||
| 197 | If unsure, say N. | 197 | If unsure, say N. |
| 198 | 198 | ||
| 199 | config IPV6_ROUTE_FWMARK | ||
| 200 | bool "IPv6: use netfilter MARK value as routing key" | ||
| 201 | depends on IPV6_MULTIPLE_TABLES && NETFILTER | ||
| 202 | ---help--- | ||
| 203 | If you say Y here, you will be able to specify different routes for | ||
| 204 | packets with different mark values (see iptables(8), MARK target). | ||
| 205 | |||