d761fec5f6
- Applied all the fixes recommended by upstream for v2.2 stable release(bsc#981996). [+0008-app-testpmd-handle-SIGINT-and-SIGTERM.patch, +0009-bonding-copy-entire-config-structure-in-mode-4.patch, +0010-bonding-fix-active-slaves-with-no-primary.patch, +0011-bonding-do-not-ignore-multicast-in-mode-4.patch, +0012-bonding-do-not-activate-slave-twice.patch, +0013-bonding-fix-crash-when-no-slave-device.patch, +0014-bonding-fix-detach-of-bonded-device.patch, +0015-bonding-fix-detach-of-slave-devices.patch, +0016-eal-linux-support-built-in-kernel-modules.patch, +0017-examples-l3fwd-handle-SIGINT-and-SIGTERM.patch, +0018-fm10k-fix-VLAN-flag-in-scattered-Rx.patch, +0019-i40e-base-fix-driver-load-failure.patch, +0020-i40e-base-fix-missing-check-for-stopped-admin-queue.patch, +0021-i40e-fix-inverted-check-for-no-refcount.patch, +0022-i40e-fix-overflow.patch, +0023-i40e-fix-VLAN-filtering.patch, +0024-mempool-fix-leak-when-creation-fails.patch, +0025-pcap-fix-captured-frame-length.patch, +0026-port-fix-crash-for-ethdev-writer-nodrop.patch, +0027-port-fix-crash-for-ring-writer-nodrop.patch, +0028-tools-fix-unbinding-failure-handling.patch, +0029-tools-support-Python-3-in-bind-script.patch, +0030-tools-support-binding-to-built-in-kernel-modules.patch, +0031-vhost-fix-leak-of-fds-and-mmaps.patch, +0032-virtio-fix-crash-in-statistics-functions.patch, +0033-virtio-fix-descriptors-pointing-to-the-same-buffer.patch, +0034-virtio-fix-restart.patch] OBS-URL: https://build.opensuse.org/request/show/399089 OBS-URL: https://build.opensuse.org/package/show/network/dpdk?expand=0&rev=3
33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
From 7656a546c0609f3205558a5d48352c82607d38d3 Mon Sep 17 00:00:00 2001
|
|
From: Xiao Wang <xiao.w.wang@intel.com>
|
|
Date: Fri, 18 Dec 2015 11:09:18 +0800
|
|
Subject: [PATCH] fm10k: fix VLAN flag in scattered Rx
|
|
|
|
In fm10k_recv_scattered_pkts function, a packet is stored in a linked list,
|
|
offload flags such as PKT_RX_VLAN_PKT should be set in the first segment.
|
|
|
|
Fixes: 6b59a3bc82b1 ("fm10k: fix VLAN in Rx mbuf")
|
|
|
|
Signed-off-by: Wang Xiao W <xiao.w.wang@intel.com>
|
|
Acked-by: Shaopeng He <shaopeng.he@intel.com>
|
|
---
|
|
drivers/net/fm10k/fm10k_rxtx.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/net/fm10k/fm10k_rxtx.c b/drivers/net/fm10k/fm10k_rxtx.c
|
|
index e958865..de31cad 100644
|
|
--- a/drivers/net/fm10k/fm10k_rxtx.c
|
|
+++ b/drivers/net/fm10k/fm10k_rxtx.c
|
|
@@ -305,7 +305,7 @@ fm10k_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
|
|
* So, always PKT_RX_VLAN_PKT flag is set and vlan_tci
|
|
* is valid for each RX packet's mbuf.
|
|
*/
|
|
- mbuf->ol_flags |= PKT_RX_VLAN_PKT;
|
|
+ first_seg->ol_flags |= PKT_RX_VLAN_PKT;
|
|
first_seg->vlan_tci = desc.w.vlan;
|
|
|
|
/* Prefetch data of first segment, if configured to do so. */
|
|
--
|
|
2.6.2
|
|
|