[dpdk-stable] [18.02 2/2] net/vmxnet3: fix Rx offload information in multiseg packets
Didier Pallard
didier.pallard at 6wind.com
Mon Apr 30 18:28:29 CEST 2018
[ backported from upstream commit d08e3c90d4e0a37618a5174c712dee1bf3cb73a3 ]
In case we are working on a multisegment buffer, most bit are set
in last segment of the buffer. Correctly look at those bits in eop part
of the rx_offload function.
Fixes: 2fdd835f992c ("vmxnet3: support jumbo frames")
Cc: stable at dpdk.org
Signed-off-by: Didier Pallard <didier.pallard at 6wind.com>
Acked-by: Yong Wang <yongwang at vmware.com>
---
drivers/net/vmxnet3/vmxnet3_rxtx.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c
index 23b69cce1029..c08d957fb093 100644
--- a/drivers/net/vmxnet3/vmxnet3_rxtx.c
+++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c
@@ -656,12 +656,19 @@ vmxnet3_rx_offload(struct vmxnet3_hw *hw, const Vmxnet3_RxCompDesc *rcd,
/* Offloads set in sop */
if (sop) {
+ } else { /* Offloads set in eop */
/* Check for RSS */
if (rcd->rssType != VMXNET3_RCD_RSS_TYPE_NONE) {
rxm->ol_flags |= PKT_RX_RSS_HASH;
rxm->hash.rss = rcd->rssHash;
}
+ /* Check for hardware stripped VLAN tag */
+ if (rcd->ts) {
+ rxm->ol_flags |= (PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED);
+ rxm->vlan_tci = rte_le_to_cpu_16((uint16_t)rcd->tci);
+ }
+
/* Check packet type, checksum errors. Only IPv4 for now. */
if (rcd->v4) {
struct ether_hdr *eth = rte_pktmbuf_mtod(rxm, struct ether_hdr *);
@@ -682,12 +689,6 @@ vmxnet3_rx_offload(struct vmxnet3_hw *hw, const Vmxnet3_RxCompDesc *rcd,
} else {
rxm->packet_type = RTE_PTYPE_UNKNOWN;
}
- } else { /* Offloads set in eop */
- /* Check for hardware stripped VLAN tag */
- if (rcd->ts) {
- rxm->ol_flags |= (PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED);
- rxm->vlan_tci = rte_le_to_cpu_16((uint16_t)rcd->tci);
- }
}
}
--
2.11.0
More information about the stable
mailing list