aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter
diff options
context:
space:
mode:
authorMoritz Sichert <moritz+linux@sichert.me>2016-06-30 05:46:28 -0400
committerPablo Neira Ayuso <pablo@netfilter.org>2016-07-01 10:37:07 -0400
commitf1504307b9ab60e73ba31eece4be8298ebc9c1b7 (patch)
tree5e26129224a73d9c37ba618783cfa7f77e79b877 /net/netfilter
parent4ae89ad92477219b504a49966ee010fe8dcb85af (diff)
netfilter: Remove references to obsolete CONFIG_IP_ROUTE_FWMARK
This option was removed in commit 47dcf0cb1005 ("[NET]: Rethink mark field in struct flowi"). Signed-off-by: Moritz Sichert <moritz+linux@sichert.me> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter')
-rw-r--r--net/netfilter/Kconfig10
1 files changed, 4 insertions, 6 deletions
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 95e757c377f9..9266ceebd112 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -609,9 +609,8 @@ config NETFILTER_XT_MARK
609 The target allows you to create rules in the "mangle" table which alter 609 The target allows you to create rules in the "mangle" table which alter
610 the netfilter mark (nfmark) field associated with the packet. 610 the netfilter mark (nfmark) field associated with the packet.
611 611
612 Prior to routing, the nfmark can influence the routing method (see 612 Prior to routing, the nfmark can influence the routing method and can
613 "Use netfilter MARK value as routing key") and can also be used by 613 also be used by other subsystems to change their behavior.
614 other subsystems to change their behavior.
615 614
616config NETFILTER_XT_CONNMARK 615config NETFILTER_XT_CONNMARK
617 tristate 'ctmark target and match support' 616 tristate 'ctmark target and match support'
@@ -753,9 +752,8 @@ config NETFILTER_XT_TARGET_HMARK
753 752
754 The target allows you to create rules in the "raw" and "mangle" tables 753 The target allows you to create rules in the "raw" and "mangle" tables
755 which set the skbuff mark by means of hash calculation within a given 754 which set the skbuff mark by means of hash calculation within a given
756 range. The nfmark can influence the routing method (see "Use netfilter 755 range. The nfmark can influence the routing method and can also be used
757 MARK value as routing key") and can also be used by other subsystems to 756 by other subsystems to change their behaviour.
758 change their behaviour.
759 757
760 To compile it as a module, choose M here. If unsure, say N. 758 To compile it as a module, choose M here. If unsure, say N.
761 759