From e7a29e46d1e8781feb1f8df1126e47a143d6b507 Mon Sep 17 00:00:00 2001 From: John Daley Date: Wed, 17 Aug 2016 15:15:26 -0700 Subject: [PATCH] net/enic: fix bad L4 checksum flag on ICMP packets The bad L4 checksum flag was set on IP packets which were not also TCP or UDP packets. This includes ICMP, IGMP and OSPF packets. L4 ptypes were being treated as bits instead of values within the L4 mask causing the code to check L4 checksum in the completion queue and incorrectly set the L4 bad checksum flag. Fixes: 947d860c821f ("enic: improve Rx performance") Reviewed-by: Nelson Escobar Signed-off-by: John Daley --- drivers/net/enic/enic_rxtx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/enic/enic_rxtx.c b/drivers/net/enic/enic_rxtx.c index 50f0b2873b..ad59613615 100644 --- a/drivers/net/enic/enic_rxtx.c +++ b/drivers/net/enic/enic_rxtx.c @@ -212,9 +212,12 @@ enic_cq_rx_to_pkt_flags(struct cq_desc *cqd, struct rte_mbuf *mbuf) /* checksum flags */ if (!enic_cq_rx_desc_csum_not_calc(cqrd) && (mbuf->packet_type & RTE_PTYPE_L3_IPV4)) { + uint32_t l4_flags = mbuf->packet_type & RTE_PTYPE_L4_MASK; + if (unlikely(!enic_cq_rx_desc_ipv4_csum_ok(cqrd))) pkt_flags |= PKT_RX_IP_CKSUM_BAD; - if (mbuf->packet_type & (RTE_PTYPE_L4_UDP | RTE_PTYPE_L4_TCP)) { + if (l4_flags == RTE_PTYPE_L4_UDP || + l4_flags == RTE_PTYPE_L4_TCP) { if (unlikely(!enic_cq_rx_desc_tcp_udp_csum_ok(cqrd))) pkt_flags |= PKT_RX_L4_CKSUM_BAD; } -- 2.20.1