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

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.4

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/24/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/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/acfff39a6d2e1c3ff1595d00970092adee2b6903

Thanks.

Kevin

---
>From acfff39a6d2e1c3ff1595d00970092adee2b6903 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>
---
 .mailmap                    | 1 +
 drivers/net/e1000/em_rxtx.c | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index f4568f4984..3337f8a9e6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1415,4 +1415,5 @@ 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>
diff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c
index cea5b490ba..73602313a7 100644
--- a/drivers/net/e1000/em_rxtx.c
+++ b/drivers/net/e1000/em_rxtx.c
@@ -1031,4 +1031,5 @@ eth_em_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
 		 *    - hardware offload data, if any:
 		 *      - IP checksum flag,
+		 *      - VLAN TCI, if any,
 		 *      - error flags.
 		 */
@@ -1040,5 +1041,5 @@ eth_em_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
 
 		/* Only valid if RTE_MBUF_F_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. */
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-03-22 10:30:08.295553752 +0000
+++ 0015-net-e1000-fix-saving-of-stripped-VLAN-TCI.patch	2023-03-22 10:30:07.920866570 +0000
@@ -1 +1 @@
-From 8d57c9fcfcda3122aa38fba08a029ec248eeb52d Mon Sep 17 00:00:00 2001
+From acfff39a6d2e1c3ff1595d00970092adee2b6903 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8d57c9fcfcda3122aa38fba08a029ec248eeb52d ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index c77cdc9ddf..e69e75ca72 100644
+index f4568f4984..3337f8a9e6 100644
@@ -23 +24 @@
-@@ -1418,4 +1418,5 @@ Vincent S. Cojot <vcojot at redhat.com>
+@@ -1415,4 +1415,5 @@ Vincent S. Cojot <vcojot at redhat.com>
@@ -30 +31 @@
-index d48fd52404..cb5ce2307b 100644
+index cea5b490ba..73602313a7 100644