Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost (0f6142fa) · Commits · e / devices / android_kernel_teracube_2e

drivers/vhost/net.c

+9 −4

Original line number	Diff line number	Diff line
		@@ -177,7 +177,7 @@ static void handle_tx(struct vhost_net *net)
		break;
		}
		if (err != len)
		pr_err("Truncated TX packet: "
		pr_debug("Truncated TX packet: "
		" len %d != %zd\n", err, len);
		vhost_add_used_and_signal(&net->dev, vq, head, 0);
		total_len += len;
		@@ -275,7 +275,7 @@ static void handle_rx(struct vhost_net *net)
		}
		/* TODO: Should check and handle checksum. */
		if (err > len) {
		pr_err("Discarded truncated rx packet: "
		pr_debug("Discarded truncated rx packet: "
		" len %d > %zd\n", err, len);
		vhost_discard_vq_desc(vq);
		continue;
		@@ -534,11 +534,16 @@ static long vhost_net_set_backend(struct vhost_net *n, unsigned index, int fd)
		rcu_assign_pointer(vq->private_data, sock);
		vhost_net_enable_vq(n, vq);
		done:
		mutex_unlock(&vq->mutex);

		if (oldsock) {
		vhost_net_flush_vq(n, index);
		fput(oldsock->file);
		}

		mutex_unlock(&n->dev.mutex);
		return 0;

		err_vq:
		mutex_unlock(&vq->mutex);
		err: