|
 |
4aca6e |
From 7bc7e80a81a32170cf1c24e6fb667d75ac6d55c7 Mon Sep 17 00:00:00 2001
|
|
|
4aca6e |
From: Phil Sutter <psutter@redhat.com>
|
|
|
4aca6e |
Date: Fri, 17 Mar 2017 13:22:39 +0100
|
|
|
4aca6e |
Subject: [PATCH] tc: flower: Fix usage message
|
|
|
4aca6e |
|
|
|
4aca6e |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1422629
|
|
|
4aca6e |
Upstream Status: iproute2.git commit d9c3995ab7ce7
|
|
|
4aca6e |
Conflicts: Changes to flower help text applied manually as per upstream
|
|
|
4aca6e |
merge commit 328374dcfea96 ("Merge branch 'master' into
|
|
|
4aca6e |
net-next").
|
|
|
4aca6e |
|
|
|
4aca6e |
commit d9c3995ab7ce7fb523d50ca513283393066219ca
|
|
|
4aca6e |
Author: Paul Blakey <paulb@mellanox.com>
|
|
|
4aca6e |
Date: Wed Nov 2 17:09:58 2016 +0200
|
|
|
4aca6e |
|
|
|
4aca6e |
tc: flower: Fix usage message
|
|
|
4aca6e |
|
|
|
4aca6e |
Remove left over usage from removal of eth_type argument.
|
|
|
4aca6e |
|
|
|
4aca6e |
Fixes: 488b41d020fb ('tc: flower no need to specify the ethertype')
|
|
|
4aca6e |
Signed-off-by: Paul Blakey <paulb@mellanox.com>
|
|
|
4aca6e |
Reviewed-by: Simon Horman <simon.horman@netronome.com>
|
|
|
4aca6e |
---
|
|
|
4aca6e |
man/man8/tc-flower.8 | 9 ---------
|
|
|
4aca6e |
tc/f_flower.c | 3 +--
|
|
|
4aca6e |
2 files changed, 1 insertion(+), 11 deletions(-)
|
|
|
4aca6e |
|
|
|
4aca6e |
diff --git a/man/man8/tc-flower.8 b/man/man8/tc-flower.8
|
|
|
4aca6e |
index 74f7664..16ef261 100644
|
|
|
4aca6e |
--- a/man/man8/tc-flower.8
|
|
|
4aca6e |
+++ b/man/man8/tc-flower.8
|
|
|
4aca6e |
@@ -23,8 +23,6 @@ flower \- flow based traffic control filter
|
|
|
4aca6e |
.R " | { "
|
|
|
4aca6e |
.BR dst_mac " | " src_mac " } "
|
|
|
4aca6e |
.IR mac_address " | "
|
|
|
4aca6e |
-.BR eth_type " { " ipv4 " | " ipv6 " | " 802.1Q " | "
|
|
|
4aca6e |
-.IR ETH_TYPE " } | "
|
|
|
4aca6e |
.B vlan_id
|
|
|
4aca6e |
.IR VID " | "
|
|
|
4aca6e |
.B vlan_prio
|
|
|
4aca6e |
@@ -75,13 +73,6 @@ Do not process filter by hardware.
|
|
|
4aca6e |
.BI src_mac " mac_address"
|
|
|
4aca6e |
Match on source or destination MAC address.
|
|
|
4aca6e |
.TP
|
|
|
4aca6e |
-.BI eth_type " ETH_TYPE"
|
|
|
4aca6e |
-Match on the next protocol.
|
|
|
4aca6e |
-.I ETH_TYPE
|
|
|
4aca6e |
-may be either
|
|
|
4aca6e |
-.BR ipv4 , ipv6 , 802.1Q ,
|
|
|
4aca6e |
-or an unsigned 16bit value in hexadecimal format.
|
|
|
4aca6e |
-.TP
|
|
|
4aca6e |
.BI vlan_id " VID"
|
|
|
4aca6e |
Match on vlan tag id.
|
|
|
4aca6e |
.I VID
|
|
|
4aca6e |
diff --git a/tc/f_flower.c b/tc/f_flower.c
|
|
|
4aca6e |
index 874a7bd..6c9bea6 100644
|
|
|
4aca6e |
--- a/tc/f_flower.c
|
|
|
4aca6e |
+++ b/tc/f_flower.c
|
|
|
4aca6e |
@@ -37,7 +37,6 @@ static void explain(void)
|
|
|
4aca6e |
" vlan_ethtype [ ipv4 | ipv6 | ETH-TYPE ] |\n"
|
|
|
4aca6e |
" dst_mac MAC-ADDR |\n"
|
|
|
4aca6e |
" src_mac MAC-ADDR |\n"
|
|
|
4aca6e |
- " [ipv4 | ipv6 ] |\n"
|
|
|
4aca6e |
" ip_proto [tcp | udp | IP-PROTO ] |\n"
|
|
|
4aca6e |
" dst_ip [ IPV4-ADDR | IPV6-ADDR ] |\n"
|
|
|
4aca6e |
" src_ip [ IPV4-ADDR | IPV6-ADDR ] |\n"
|
|
|
4aca6e |
@@ -46,7 +45,7 @@ static void explain(void)
|
|
|
4aca6e |
" FILTERID := X:Y:Z\n"
|
|
|
4aca6e |
" ACTION-SPEC := ... look at individual actions\n"
|
|
|
4aca6e |
"\n"
|
|
|
4aca6e |
- "NOTE: CLASSID, ETH-TYPE, IP-PROTO are parsed as hexadecimal input.\n"
|
|
|
4aca6e |
+ "NOTE: CLASSID, IP-PROTO are parsed as hexadecimal input.\n"
|
|
|
4aca6e |
"NOTE: There can be only used one mask per one prio. If user needs\n"
|
|
|
4aca6e |
" to specify different mask, he has to use different prio.\n");
|
|
|
4aca6e |
}
|
|
|
4aca6e |
--
|
|
|
4aca6e |
1.8.3.1
|
|
|
4aca6e |
|