From 7f55a2053b908ff08a8a2d1cc8d4d927923d52f7 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Wed, 20 May 2020 11:56:02 +0200 Subject: [PATCH] net/mvpp2: fix build with gcc 10 GCC 10 is detecting the enum mismatch when assigning UDP variables with MUSDK constants for TCP. drivers/net/mvpp2/mrvl_flow.c:2521:47: error: implicit conversion from 'enum mv_net_tcp_fields' to 'enum mv_net_udp_fields' [-Werror=enum-conversion] An assigned field is also fixed from "tcp" to "udp". Fixes: 7235341d7517 ("net/mrvl: support classifier") Cc: stable@dpdk.org Signed-off-by: Thomas Monjalon Acked-by: Liron Himi Acked-by: David Marchand Acked-by: Kevin Traynor --- drivers/net/mvpp2/mrvl_flow.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/mvpp2/mrvl_flow.c b/drivers/net/mvpp2/mrvl_flow.c index 381b54e291..ea43255284 100644 --- a/drivers/net/mvpp2/mrvl_flow.c +++ b/drivers/net/mvpp2/mrvl_flow.c @@ -2511,14 +2511,14 @@ mrvl_create_cls_table(struct rte_eth_dev *dev, struct rte_flow *first_flow) if (first_flow->pattern & F_UDP_SPORT) { key->proto_field[key->num_fields].proto = MV_NET_PROTO_UDP; - key->proto_field[key->num_fields].field.tcp = MV_NET_TCP_F_SP; + key->proto_field[key->num_fields].field.udp = MV_NET_UDP_F_SP; key->key_size += 2; key->num_fields += 1; } if (first_flow->pattern & F_UDP_DPORT) { key->proto_field[key->num_fields].proto = MV_NET_PROTO_UDP; - key->proto_field[key->num_fields].field.udp = MV_NET_TCP_F_DP; + key->proto_field[key->num_fields].field.udp = MV_NET_UDP_F_DP; key->key_size += 2; key->num_fields += 1; } -- 2.20.1