1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index 8d626d7c2e7e..c7bdeb655646 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -778,16 +778,6 @@ static void handle_rx(struct vhost_net *net)
                 /* On error, stop handling until the next kick. */
                 if (unlikely(headcount < 0))
                         goto out;
-                if (nvq->rx_array)
-                        msg.msg_control = vhost_net_buf_consume(&nvq->rxq);
-                /* On overrun, truncate and discard */
-                if (unlikely(headcount > UIO_MAXIOV)) {
-                        iov_iter_init(&msg.msg_iter, READ, vq->iov, 1, 1);
-                        err = sock->ops->recvmsg(sock, &msg,
-                                                 1, MSG_DONTWAIT | MSG_TRUNC);
-                        pr_debug("Discarded rx packet: len %zd\n", sock_len);
-                        continue;
-                }
                 /* OK, now we need to know about added descriptors. */
                 if (!headcount) {
                         if (unlikely(vhost_enable_notify(&net->dev, vq))) {
@@ -800,6 +790,16 @@ static void handle_rx(struct vhost_net *net)
                          * they refilled. */
                         goto out;
                 }
+                if (nvq->rx_array)
+                        msg.msg_control = vhost_net_buf_consume(&nvq->rxq);
+                /* On overrun, truncate and discard */
+                if (unlikely(headcount > UIO_MAXIOV)) {
+                        iov_iter_init(&msg.msg_iter, READ, vq->iov, 1, 1);
+                        err = sock->ops->recvmsg(sock, &msg,
+                                                 1, MSG_DONTWAIT | MSG_TRUNC);
+                        pr_debug("Discarded rx packet: len %zd\n", sock_len);
+                        continue;
+                }
                 /* We don't need to be notified again. */
                 iov_iter_init(&msg.msg_iter, READ, vq->iov, in, vhost_len);
                 fixup = msg.msg_iter;