|
 |
4aca6e |
From cca1d8a85219947ad8c0a202f41278b582c63daa Mon Sep 17 00:00:00 2001
|
|
|
4aca6e |
From: Phil Sutter <psutter@redhat.com>
|
|
|
4aca6e |
Date: Fri, 17 Mar 2017 13:23:33 +0100
|
|
|
4aca6e |
Subject: [PATCH] tc: flower: correct name of ip_proto parameter to
|
|
|
4aca6e |
flower_parse_port()
|
|
|
4aca6e |
|
|
|
4aca6e |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1422629
|
|
|
4aca6e |
Upstream Status: iproute2.git commit 61dff9ac10cb5
|
|
|
4aca6e |
|
|
|
4aca6e |
commit 61dff9ac10cb55c4f66b7df7a003c420f6f1d430
|
|
|
4aca6e |
Author: Simon Horman <simon.horman@netronome.com>
|
|
|
4aca6e |
Date: Sat Dec 3 09:52:39 2016 +0100
|
|
|
4aca6e |
|
|
|
4aca6e |
tc: flower: correct name of ip_proto parameter to flower_parse_port()
|
|
|
4aca6e |
|
|
|
4aca6e |
This corrects a typo.
|
|
|
4aca6e |
|
|
|
4aca6e |
Fixes: a1fb0d484237 ("tc: flower: Support matching on SCTP ports")
|
|
|
4aca6e |
Signed-off-by: Simon Horman <simon.horman@netronome.com>
|
|
|
4aca6e |
---
|
|
|
4aca6e |
tc/f_flower.c | 12 ++++++------
|
|
|
4aca6e |
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
4aca6e |
|
|
|
4aca6e |
diff --git a/tc/f_flower.c b/tc/f_flower.c
|
|
|
4aca6e |
index 26afe73..cac2802 100644
|
|
|
4aca6e |
--- a/tc/f_flower.c
|
|
|
4aca6e |
+++ b/tc/f_flower.c
|
|
|
4aca6e |
@@ -166,15 +166,15 @@ static int flower_parse_ip_addr(char *str, __be16 eth_type,
|
|
|
4aca6e |
return 0;
|
|
|
4aca6e |
}
|
|
|
4aca6e |
|
|
|
4aca6e |
-static int flower_port_attr_type(__u8 ip_port, bool is_src)
|
|
|
4aca6e |
+static int flower_port_attr_type(__u8 ip_proto, bool is_src)
|
|
|
4aca6e |
{
|
|
|
4aca6e |
- if (ip_port == IPPROTO_TCP) {
|
|
|
4aca6e |
+ if (ip_proto == IPPROTO_TCP) {
|
|
|
4aca6e |
return is_src ? TCA_FLOWER_KEY_TCP_SRC :
|
|
|
4aca6e |
TCA_FLOWER_KEY_TCP_DST;
|
|
|
4aca6e |
- } else if (ip_port == IPPROTO_UDP) {
|
|
|
4aca6e |
+ } else if (ip_proto == IPPROTO_UDP) {
|
|
|
4aca6e |
return is_src ? TCA_FLOWER_KEY_UDP_SRC :
|
|
|
4aca6e |
TCA_FLOWER_KEY_UDP_DST;
|
|
|
4aca6e |
- } else if (ip_port == IPPROTO_SCTP) {
|
|
|
4aca6e |
+ } else if (ip_proto == IPPROTO_SCTP) {
|
|
|
4aca6e |
return is_src ? TCA_FLOWER_KEY_SCTP_SRC :
|
|
|
4aca6e |
TCA_FLOWER_KEY_SCTP_DST;
|
|
|
4aca6e |
} else {
|
|
|
4aca6e |
@@ -183,14 +183,14 @@ static int flower_port_attr_type(__u8 ip_port, bool is_src)
|
|
|
4aca6e |
}
|
|
|
4aca6e |
}
|
|
|
4aca6e |
|
|
|
4aca6e |
-static int flower_parse_port(char *str, __u8 ip_port, bool is_src,
|
|
|
4aca6e |
+static int flower_parse_port(char *str, __u8 ip_proto, bool is_src,
|
|
|
4aca6e |
struct nlmsghdr *n)
|
|
|
4aca6e |
{
|
|
|
4aca6e |
int ret;
|
|
|
4aca6e |
int type;
|
|
|
4aca6e |
__be16 port;
|
|
|
4aca6e |
|
|
|
4aca6e |
- type = flower_port_attr_type(ip_port, is_src);
|
|
|
4aca6e |
+ type = flower_port_attr_type(ip_proto, is_src);
|
|
|
4aca6e |
if (type < 0)
|
|
|
4aca6e |
return -1;
|
|
|
4aca6e |
|
|
|
4aca6e |
--
|
|
|
4aca6e |
1.8.3.1
|
|
|
4aca6e |
|