naccyde / rpms / iproute

Forked from rpms/iproute 7 months ago
Clone

Blame SOURCES/0136-tc-flower-Update-documentation-to-indicate-ARP-takes.patch

4aca6e
From 7a735e3018eff5df906c64bb242db236320a9583 Mon Sep 17 00:00:00 2001
4aca6e
From: Phil Sutter <psutter@redhat.com>
4aca6e
Date: Fri, 17 Mar 2017 13:25:13 +0100
4aca6e
Subject: [PATCH] tc: flower: Update documentation to indicate ARP takes IPv4
4aca6e
 prefixes
4aca6e
4aca6e
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1422629
4aca6e
Upstream Status: iproute2.git commit c7ec052bb8682
4aca6e
4aca6e
commit c7ec052bb8682a9889d1e71e2cb2ec780c9d5e26
4aca6e
Author: Simon Horman <simon.horman@netronome.com>
4aca6e
Date:   Wed Feb 8 13:01:04 2017 +0100
4aca6e
4aca6e
    tc: flower: Update documentation to indicate ARP takes IPv4 prefixes
4aca6e
4aca6e
    Unlike other PREFIXes documented in the usage for tc flower, which accept
4aca6e
    both IPv4 and IPv6 prefixes, arp_sip and arp_tip only accepts IPv4
4aca6e
    prefixes.
4aca6e
4aca6e
    Signed-off-by: Simon Horman <simon.horman@netronome.com>
4aca6e
---
4aca6e
 man/man8/tc-flower.8 | 8 ++++----
4aca6e
 tc/f_flower.c        | 4 ++--
4aca6e
 2 files changed, 6 insertions(+), 6 deletions(-)
4aca6e
4aca6e
diff --git a/man/man8/tc-flower.8 b/man/man8/tc-flower.8
4aca6e
index 2bdd2ef..b1bef8b 100644
4aca6e
--- a/man/man8/tc-flower.8
4aca6e
+++ b/man/man8/tc-flower.8
4aca6e
@@ -36,7 +36,7 @@ flower \- flow based traffic control filter
4aca6e
 .BR dst_port " | " src_port " } "
4aca6e
 .IR port_number " } | { "
4aca6e
 .BR arp_tip " | " arp_sip " } "
4aca6e
-.IR PREFIX " | "
4aca6e
+.IR IPV4_PREFIX " | "
4aca6e
 .BR arp_op " { " request " | " reply " | "
4aca6e
 .IR OP " } | { "
4aca6e
 .BR arp_tha " | " arp_sha " } "
4aca6e
@@ -139,11 +139,11 @@ Match on ICMP type or code. Only available for
4aca6e
 .BR ip_proto " values " icmp  " and " icmpv6
4aca6e
 which have to be specified in beforehand.
4aca6e
 .TP
4aca6e
-.BI arp_tip " PREFIX"
4aca6e
+.BI arp_tip " IPV4_PREFIX"
4aca6e
 .TQ
4aca6e
-.BI arp_sip " PREFIX"
4aca6e
+.BI arp_sip " IPV4_PREFIX"
4aca6e
 Match on ARP or RARP sender or target IP address.
4aca6e
-.I PREFIX
4aca6e
+.I IPV4_PREFIX
4aca6e
 must be a valid IPv4 address optionally followed by a slash and the prefix
4aca6e
 length. If the prefix is missing, \fBtc\fR assumes a full-length host
4aca6e
 match.
4aca6e
diff --git a/tc/f_flower.c b/tc/f_flower.c
4aca6e
index b4bf886..a2b2132 100644
4aca6e
--- a/tc/f_flower.c
4aca6e
+++ b/tc/f_flower.c
4aca6e
@@ -59,8 +59,8 @@ static void explain(void)
4aca6e
 		"                       src_port PORT-NUMBER |\n"
4aca6e
 		"                       type ICMP-TYPE |\n"
4aca6e
 		"                       code ICMP-CODE |\n"
4aca6e
-		"                       arp_tip PREFIX |\n"
4aca6e
-		"                       arp_sip PREFIX |\n"
4aca6e
+		"                       arp_tip IPV4-PREFIX |\n"
4aca6e
+		"                       arp_sip IPV4-PREFIX |\n"
4aca6e
 		"                       arp_op [ request | reply | OP ] |\n"
4aca6e
 		"                       arp_tha MASKED-LLADDR |\n"
4aca6e
 		"                       arp_sha MASKED-LLADDR |\n"
4aca6e
-- 
4aca6e
1.8.3.1
4aca6e