patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Rasesh Mody <rasesh.mody@cavium.com>
To: stable@dpdk.org
Cc: Harish Patil <harish.patil@cavium.com>,
	yliu@fridaylinux.org, Dept-EngDPDKDev@cavium.com
Subject: [dpdk-stable] [PATCH 17.11 3/5] net/qede: fix to prevent overwriting packet type
Date: Thu,  7 Jun 2018 17:51:12 -0700	[thread overview]
Message-ID: <1528419074-18954-3-git-send-email-rasesh.mody@cavium.com> (raw)
In-Reply-To: <1528419074-18954-1-git-send-email-rasesh.mody@cavium.com>

From: Harish Patil <harish.patil@cavium.com>

[ upstream commit c152cbe2522afa12e49bdc4bb19eb5adc6227218 ]

Fixes: 3f72dd780e10 ("net/qede: check tunnel L3 header")

Signed-off-by: Harish Patil <harish.patil@cavium.com>
---
 drivers/net/qede/qede_rxtx.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/qede/qede_rxtx.c b/drivers/net/qede/qede_rxtx.c
index 69c84af..49b5bc5 100644
--- a/drivers/net/qede/qede_rxtx.c
+++ b/drivers/net/qede/qede_rxtx.c
@@ -1466,6 +1466,8 @@ static inline uint32_t qede_rx_cqe_to_tunn_pkt_type(uint16_t flags)
 			 */
 			rx_mb->data_off = offset + RTE_PKTMBUF_HEADROOM;
 			packet_type |= qede_rx_cqe_to_pkt_type_outer(rx_mb);
+		} else {
+			packet_type |= qede_rx_cqe_to_pkt_type(parse_flag);
 		}
 
 		/* Common handling for non-tunnel packets and for inner
@@ -1487,7 +1489,6 @@ static inline uint32_t qede_rx_cqe_to_tunn_pkt_type(uint16_t flags)
 			ol_flags |= PKT_RX_IP_CKSUM_BAD;
 		} else {
 			ol_flags |= PKT_RX_IP_CKSUM_GOOD;
-			packet_type |= qede_rx_cqe_to_pkt_type(parse_flag);
 		}
 
 		if (CQE_HAS_VLAN(parse_flag) ||
-- 
1.7.10.3

  parent reply	other threads:[~2018-06-08  0:51 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-08  0:51 [dpdk-stable] [PATCH 17.11 1/5] net/qede: fix VF port creation sequence Rasesh Mody
2018-06-08  0:51 ` [dpdk-stable] [PATCH 17.11 2/5] net/qede: fix device stop to remove primary MAC Rasesh Mody
2018-06-08  0:51 ` Rasesh Mody [this message]
2018-06-08  0:51 ` [dpdk-stable] [PATCH 17.11 4/5] net/qede/base: fix to support OVLAN mode Rasesh Mody
2018-06-08  0:51 ` [dpdk-stable] [PATCH 17.11 5/5] net/qede: fix L2-handles used for RSS hash update Rasesh Mody
2018-06-08 14:45   ` Yuanhan Liu
2018-06-08 23:10     ` Mody, Rasesh
2018-06-15 14:33       ` Yuanhan Liu
2018-06-15 16:54         ` Mody, Rasesh

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1528419074-18954-3-git-send-email-rasesh.mody@cavium.com \
    --to=rasesh.mody@cavium.com \
    --cc=Dept-EngDPDKDev@cavium.com \
    --cc=harish.patil@cavium.com \
    --cc=stable@dpdk.org \
    --cc=yliu@fridaylinux.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).