Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/98524

_apply patch failure_

Submitter: Gaoxiang Liu <gaoxiangliu0@163.com>
Date: Friday, September 10 2021 02:11:17 
Applied on: CommitID:dbf81c338cdcf9737315c57ac4dfd40df4c6b8e9
Apply patch set 98524 failed:

.git/rebase-apply/patch:99: trailing whitespace.
	
Checking patch drivers/net/vhost/rte_eth_vhost.c...
Checking patch lib/vhost/virtio_net.c...
Hunk #1 succeeded at 1218 (offset -5 lines).
error: while searching for:
	do {
		rte_prefetch0(&vq->desc_packed[vq->last_avail_idx]);

		if (count - pkt_idx >= PACKED_BATCH_SIZE) {
			if (!virtio_dev_rx_batch_packed(dev, vq,
							&pkts[pkt_idx])) {

error: patch failed: lib/vhost/virtio_net.c:1374
Applied patch drivers/net/vhost/rte_eth_vhost.c cleanly.
Applying patch lib/vhost/virtio_net.c with 1 reject...
Hunk #1 applied cleanly.
Rejected hunk #2.
diff a/lib/vhost/virtio_net.c b/lib/vhost/virtio_net.c	(rejected hunks)
@@ -1374,6 +1384,17 @@ virtio_dev_rx_packed(struct virtio_net *dev,
 	do {
 		rte_prefetch0(&vq->desc_packed[vq->last_avail_idx]);
 
+		/* Do VLAN tag insertion */
+		if (pkts[pkt_idx]->ol_flags & PKT_TX_VLAN_PKT) {
+			int error = rte_vlan_insert(&pkts[pkt_idx]);
+			if (unlikely(error)) {
+				rte_pktmbuf_free(pkts[pkt_idx]);
+				pkts[pkt_idx] = NULL;
+				pkt_idx++;
+				continue;
+			}
+		}
+	
 		if (count - pkt_idx >= PACKED_BATCH_SIZE) {
 			if (!virtio_dev_rx_batch_packed(dev, vq,
 							&pkts[pkt_idx])) {

https://lab.dpdk.org/results/dashboard/patchsets/18663/

UNH-IOL DPDK Community Lab