39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
From 2706951bc0dad80596f172e9197452163bc9e067 Mon Sep 17 00:00:00 2001
|
|
From: Simon Horman <simon.horman@netronome.com>
|
|
Date: Wed, 8 Feb 2017 13:04:31 +0100
|
|
Subject: [PATCH] tc: flower: use correct type when calling
|
|
flower_icmp_attr_type
|
|
|
|
Use enum flower_icmp_field rather than bool as type of third parameter
|
|
when calling flower_icmp_attr_type.
|
|
|
|
Fixes: eb3b5696f163 ("tc: flower: support matching on ICMP type and code")
|
|
Signed-off-by: Simon Horman <simon.horman@netronome.com>
|
|
(cherry picked from commit 81f6e5a7279eaab826ba8b291b98fb2e89df0572)
|
|
---
|
|
tc/f_flower.c | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/tc/f_flower.c b/tc/f_flower.c
|
|
index 145a8566..75a3fbbc 100644
|
|
--- a/tc/f_flower.c
|
|
+++ b/tc/f_flower.c
|
|
@@ -752,10 +752,12 @@ static int flower_print_opt(struct filter_util *qu, FILE *f,
|
|
if (nl_type >= 0)
|
|
flower_print_port(f, "src_port", tb[nl_type]);
|
|
|
|
- nl_type = flower_icmp_attr_type(eth_type, ip_proto, false);
|
|
+ nl_type = flower_icmp_attr_type(eth_type, ip_proto,
|
|
+ FLOWER_ICMP_FIELD_TYPE);
|
|
if (nl_type >= 0)
|
|
flower_print_icmp(f, "icmp_type", tb[nl_type]);
|
|
- nl_type = flower_icmp_attr_type(eth_type, ip_proto, true);
|
|
+ nl_type = flower_icmp_attr_type(eth_type, ip_proto,
|
|
+ FLOWER_ICMP_FIELD_CODE);
|
|
if (nl_type >= 0)
|
|
flower_print_icmp(f, "icmp_code", tb[nl_type]);
|
|
|
|
--
|
|
2.11.0
|
|
|