|
|
4aca6e |
From 86ccfa5ca33949fa5a53d423a8b352cc243bf1b5 Mon Sep 17 00:00:00 2001
|
|
|
4aca6e |
From: Phil Sutter <psutter@redhat.com>
|
|
|
4aca6e |
Date: Fri, 17 Mar 2017 13:18:52 +0100
|
|
|
4aca6e |
Subject: [PATCH] tc: ship filter man pages and refer to them in tc.8
|
|
|
4aca6e |
|
|
|
4aca6e |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1422629
|
|
|
4aca6e |
Upstream Status: iproute2.git commit a257bc7b4c481
|
|
|
4aca6e |
Conflicts: Just reapplying missing bits about flower from already
|
|
|
4aca6e |
backported commit.
|
|
|
4aca6e |
|
|
|
4aca6e |
commit a257bc7b4c481d4b2871508edfccc198d1e56c8a
|
|
|
4aca6e |
Author: Phil Sutter <phil@nwl.cc>
|
|
|
4aca6e |
Date: Fri Oct 23 19:47:16 2015 +0200
|
|
|
4aca6e |
|
|
|
4aca6e |
tc: ship filter man pages and refer to them in tc.8
|
|
|
4aca6e |
|
|
|
4aca6e |
Cc: Thomas Graf <tgraf@suug.ch>
|
|
|
4aca6e |
Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
|
|
|
4aca6e |
Cc: Jiri Pirko <jiri@resnulli.us>
|
|
|
4aca6e |
Cc: Patrick McHardy <kaber@trash.net>
|
|
|
4aca6e |
Cc: Werner Almesberger <werner@almesberger.net>
|
|
|
4aca6e |
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
|
4aca6e |
---
|
|
|
4aca6e |
man/man8/Makefile | 2 +-
|
|
|
4aca6e |
man/man8/tc.8 | 8 +++++---
|
|
|
4aca6e |
2 files changed, 6 insertions(+), 4 deletions(-)
|
|
|
4aca6e |
|
|
|
4aca6e |
diff --git a/man/man8/Makefile b/man/man8/Makefile
|
|
|
4aca6e |
index f3a3fa5..8d73f1e 100644
|
|
|
4aca6e |
--- a/man/man8/Makefile
|
|
|
4aca6e |
+++ b/man/man8/Makefile
|
|
|
4aca6e |
@@ -11,7 +11,7 @@ MAN8PAGES = $(TARGETS) ip.8 arpd.8 lnstat.8 routel.8 rtacct.8 rtmon.8 rtpr.8 ss.
|
|
|
4aca6e |
ip-maddress.8 ip-monitor.8 ip-mroute.8 ip-neighbour.8 \
|
|
|
4aca6e |
ip-netns.8 ip-ntable.8 ip-rule.8 ip-tunnel.8 ip-xfrm.8 \
|
|
|
4aca6e |
ip-tcp_metrics.8 ip-netconf.8 ip-token.8 \
|
|
|
4aca6e |
- tc-basic.8 tc-cgroup.8 tc-flow.8 tc-fw.8 tc-route.8 \
|
|
|
4aca6e |
+ tc-basic.8 tc-cgroup.8 tc-flow.8 tc-flower.8 tc-fw.8 tc-route.8 \
|
|
|
4aca6e |
tc-tcindex.8 tc-u32.8 \
|
|
|
4aca6e |
tc-csum.8 tc-mirred.8 tc-nat.8 tc-pedit.8 tc-police.8 \
|
|
|
4aca6e |
tc-simple.8 tc-skbedit.8 tc-xt.8
|
|
|
4aca6e |
diff --git a/man/man8/tc.8 b/man/man8/tc.8
|
|
|
4aca6e |
index 391d7c7..ee3479e 100644
|
|
|
4aca6e |
--- a/man/man8/tc.8
|
|
|
4aca6e |
+++ b/man/man8/tc.8
|
|
|
4aca6e |
@@ -158,9 +158,10 @@ Filter packets based on the control group of their process. See
|
|
|
4aca6e |
. BR tc-cgroup (8)
|
|
|
4aca6e |
for details.
|
|
|
4aca6e |
.TP
|
|
|
4aca6e |
-flow
|
|
|
4aca6e |
-Flow-based classifier, filtering packets based on their flow (identified by selectable keys). See
|
|
|
4aca6e |
-.BR tc-flow (8)
|
|
|
4aca6e |
+flow, flower
|
|
|
4aca6e |
+Flow-based classifiers, filtering packets based on their flow (identified by selectable keys). See
|
|
|
4aca6e |
+.BR tc-flow "(8) and"
|
|
|
4aca6e |
+.BR tc-flower (8)
|
|
|
4aca6e |
for details.
|
|
|
4aca6e |
.TP
|
|
|
4aca6e |
fw
|
|
|
4aca6e |
@@ -635,6 +636,7 @@ was written by Alexey N. Kuznetsov and added in Linux 2.2.
|
|
|
4aca6e |
.BR tc-drr (8),
|
|
|
4aca6e |
.BR tc-ematch (8),
|
|
|
4aca6e |
.BR tc-flow (8),
|
|
|
4aca6e |
+.BR tc-flower (8),
|
|
|
4aca6e |
.BR tc-fq (8),
|
|
|
4aca6e |
.BR tc-fq_codel (8),
|
|
|
4aca6e |
.BR tc-fw (8),
|
|
|
4aca6e |
--
|
|
|
4aca6e |
1.8.3.1
|
|
|
4aca6e |
|