linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] netfilter: Remove references to obsolete CONFIG_IP_ROUTE_FWMARK
@ 2016-06-30  9:46 Moritz Sichert
  2016-06-30 13:59 ` Pablo Neira Ayuso
  0 siblings, 1 reply; 2+ messages in thread
From: Moritz Sichert @ 2016-06-30  9:46 UTC (permalink / raw)
  To: linux-kernel, netfilter-devel
  Cc: Pablo Neira Ayuso, Patrick McHardy, Jozsef Kadlecsik

This option was removed in commit 47dcf0cb1005 ("[NET]: Rethink mark field
in struct flowi").

Signed-off-by: Moritz Sichert <moritz+linux@sichert.me>
---
 net/netfilter/Kconfig | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 95e757c..9266cee 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -609,9 +609,8 @@ config NETFILTER_XT_MARK
 	The target allows you to create rules in the "mangle" table which alter
 	the netfilter mark (nfmark) field associated with the packet.
 
-	Prior to routing, the nfmark can influence the routing method (see
-	"Use netfilter MARK value as routing key") and can also be used by
-	other subsystems to change their behavior.
+	Prior to routing, the nfmark can influence the routing method and can
+	also be used by other subsystems to change their behavior.
 
 config NETFILTER_XT_CONNMARK
 	tristate 'ctmark target and match support'
@@ -753,9 +752,8 @@ config NETFILTER_XT_TARGET_HMARK
 
 	The target allows you to create rules in the "raw" and "mangle" tables
 	which set the skbuff mark by means of hash calculation within a given
-	range. The nfmark can influence the routing method (see "Use netfilter
-	MARK value as routing key") and can also be used by other subsystems to
-	change their behaviour.
+	range. The nfmark can influence the routing method and can also be used
+	by other subsystems to change their behaviour.
 
 	To compile it as a module, choose M here. If unsure, say N.
 
-- 
2.9.0

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] netfilter: Remove references to obsolete CONFIG_IP_ROUTE_FWMARK
  2016-06-30  9:46 [PATCH] netfilter: Remove references to obsolete CONFIG_IP_ROUTE_FWMARK Moritz Sichert
@ 2016-06-30 13:59 ` Pablo Neira Ayuso
  0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2016-06-30 13:59 UTC (permalink / raw)
  To: Moritz Sichert
  Cc: linux-kernel, netfilter-devel, Patrick McHardy, Jozsef Kadlecsik

On Thu, Jun 30, 2016 at 11:46:28AM +0200, Moritz Sichert wrote:
> This option was removed in commit 47dcf0cb1005 ("[NET]: Rethink mark field
> in struct flowi").

Applied, thanks.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-06-30 14:00 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-30  9:46 [PATCH] netfilter: Remove references to obsolete CONFIG_IP_ROUTE_FWMARK Moritz Sichert
2016-06-30 13:59 ` Pablo Neira Ayuso

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).