patch 'net/e1000: fix saving of stripped VLAN TCI' has been queued to stable release 20.11.8

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.8

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/23/23. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/3ab75a1082837cc52f640990aa25551be9f7d54b

Thanks.

Luca Boccassi

---
>From 3ab75a1082837cc52f640990aa25551be9f7d54b Mon Sep 17 00:00:00 2001
From: Visa Hankala <visa at hankala.org>
Date: Sun, 12 Mar 2023 13:44:42 +0000
Subject: [PATCH] net/e1000: fix saving of stripped VLAN TCI

[ upstream commit 8d57c9fcfcda3122aa38fba08a029ec248eeb52d ]

When receiving a scattered packet, save the stripped VLAN TCI
in the first mbuf segment where users expect to find it.

Fixes: 805803445a02 ("e1000: support EM devices (also known as e1000/e1000e)")

Signed-off-by: Visa Hankala <visa at hankala.org>
Acked-by: Wenjun Wu <wenjun1.wu at intel.com>
---
 drivers/net/e1000/em_rxtx.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c
index b86cc43e2c..cb5d749d46 100644
--- a/drivers/net/e1000/em_rxtx.c
+++ b/drivers/net/e1000/em_rxtx.c
@@ -1031,6 +1031,7 @@ eth_em_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
 		 *    - RX port identifier,
 		 *    - hardware offload data, if any:
 		 *      - IP checksum flag,
+		 *      - VLAN TCI, if any,
 		 *      - error flags.
 		 */
 		first_seg->port = rxq->port_id;
@@ -1040,7 +1041,7 @@ eth_em_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
 					rx_desc_error_to_pkt_flags(rxd.errors);
 
 		/* Only valid if PKT_RX_VLAN set in pkt_flags */
-		rxm->vlan_tci = rte_le_to_cpu_16(rxd.special);
+		first_seg->vlan_tci = rte_le_to_cpu_16(rxd.special);
 
 		/* Prefetch data of first segment, if configured to do so. */
 		rte_packet_prefetch((char *)first_seg->buf_addr +
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-03-21 21:56:37.530530518 +0000
+++ 0012-net-e1000-fix-saving-of-stripped-VLAN-TCI.patch	2023-03-21 21:56:37.068806966 +0000
@@ -1 +1 @@
-From 8d57c9fcfcda3122aa38fba08a029ec248eeb52d Mon Sep 17 00:00:00 2001
+From 3ab75a1082837cc52f640990aa25551be9f7d54b Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8d57c9fcfcda3122aa38fba08a029ec248eeb52d ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -15 +15,0 @@
- .mailmap                    | 1 +
@@ -17 +17 @@
- 2 files changed, 3 insertions(+), 1 deletion(-)
+ 1 file changed, 2 insertions(+), 1 deletion(-)
@@ -19,12 +18,0 @@
-diff --git a/.mailmap b/.mailmap
-index c77cdc9ddf..e69e75ca72 100644
---- a/.mailmap
-+++ b/.mailmap
-@@ -1417,6 +1417,7 @@ Vincent Li <vincent.mc.li at gmail.com>
- Vincent S. Cojot <vcojot at redhat.com>
- Vipin Varghese <vipin.varghese at amd.com> <vipin.varghese at intel.com>
- Vipul Ashri <vipul.ashri at oracle.com>
-+Visa Hankala <visa at hankala.org>
- Vishal Kulkarni <vishal at chelsio.com>
- Vishwas Danivas <vishwas at pensando.io>
- Vitaliy Mysak <vitaliy.mysak at intel.com>
@@ -32 +20 @@
-index d48fd52404..cb5ce2307b 100644
+index b86cc43e2c..cb5d749d46 100644
@@ -35 +23 @@
-@@ -1030,6 +1030,7 @@ eth_em_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
+@@ -1031,6 +1031,7 @@ eth_em_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
@@ -43 +31 @@
-@@ -1039,7 +1040,7 @@ eth_em_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
+@@ -1040,7 +1041,7 @@ eth_em_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
@@ -46 +34 @@
- 		/* Only valid if RTE_MBUF_F_RX_VLAN set in pkt_flags */
+ 		/* Only valid if PKT_RX_VLAN set in pkt_flags */