[dpdk-stable] patch 'net/virtio-user: fix setting filters' has been queued to LTS release 18.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/17/19. 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-queue

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

Thanks.

Kevin.

---
>From 71ae3517754aa162257988e6c34746ffc20d78aa Mon Sep 17 00:00:00 2001
From: Marvin Liu <yong.liu at intel.com>
Date: Wed, 6 Nov 2019 17:02:50 +0800
Subject: [PATCH] net/virtio-user: fix setting filters

[ upstream commit a76552d48f17a990662592ff5e13a6e83b62025c ]

As doc mentioned, Rx/Mac/vlan filters are all supported by best effort.
These control commands should return success.

Fixes: f9b9d1a55775 ("net/virtio-user: add multiple queues in device emulation")

Signed-off-by: Marvin Liu <yong.liu at intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 drivers/net/virtio/virtio_user/virtio_user_dev.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c
index f0051f887..8e8adf6bb 100644
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
@@ -601,4 +601,8 @@ virtio_user_handle_ctrl_msg(struct virtio_user_dev *dev, struct vring *vring,
 		queues = *(uint16_t *)(uintptr_t)vring->desc[idx_data].addr;
 		status = virtio_user_handle_mq(dev, queues);
+	} else if (hdr->class == VIRTIO_NET_CTRL_RX  ||
+		   hdr->class == VIRTIO_NET_CTRL_MAC ||
+		   hdr->class == VIRTIO_NET_CTRL_VLAN) {
+		status = 0;
 	}
 
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-11 21:24:13.726213233 +0000
+++ 0012-net-virtio-user-fix-setting-filters.patch	2019-12-11 21:24:12.591652788 +0000
@@ -1 +1 @@
-From a76552d48f17a990662592ff5e13a6e83b62025c Mon Sep 17 00:00:00 2001
+From 71ae3517754aa162257988e6c34746ffc20d78aa Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a76552d48f17a990662592ff5e13a6e83b62025c ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -15,2 +16,2 @@
- drivers/net/virtio/virtio_user/virtio_user_dev.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
+ drivers/net/virtio/virtio_user/virtio_user_dev.c | 4 ++++
+ 1 file changed, 4 insertions(+)
@@ -19 +20 @@
-index 1c575d0cd..a4400e772 100644
+index f0051f887..8e8adf6bb 100644
@@ -22 +23 @@
-@@ -614,4 +614,8 @@ virtio_user_handle_ctrl_msg(struct virtio_user_dev *dev, struct vring *vring,
+@@ -601,4 +601,8 @@ virtio_user_handle_ctrl_msg(struct virtio_user_dev *dev, struct vring *vring,
@@ -24,9 +24,0 @@
- 		status = virtio_user_handle_mq(dev, queues);
-+	} else if (hdr->class == VIRTIO_NET_CTRL_RX  ||
-+		   hdr->class == VIRTIO_NET_CTRL_MAC ||
-+		   hdr->class == VIRTIO_NET_CTRL_VLAN) {
-+		status = 0;
- 	}
- 
-@@ -665,4 +669,8 @@ virtio_user_handle_ctrl_msg_packed(struct virtio_user_dev *dev,
- 				vring->desc[idx_data].addr;