[PATCH for-3.7] vhost: fix mergeable bufs on BE hosts

We copy head count to a 16 bit field,
this works by chance on LE but on BE
guest gets 0. Fix it up.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Tested-by: Alexander Graf <redacted>
Cc: stable@kernel.org

---
 drivers/vhost/net.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index 9ab6d47..2bb463c 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c

@@ -448,7 +448,8 @@ static void handle_rx(struct vhost_net *net)
 		.hdr.gso_type = VIRTIO_NET_HDR_GSO_NONE
 	};
 	size_t total_len = 0;
-	int err, headcount, mergeable;
+	int err, mergeable;
+	s16 headcount;
 	size_t vhost_hlen, sock_hlen;
 	size_t vhost_len, sock_len;
 	/* TODO: check that we are running from vhost_worker? */

-- 
MST

On Mon, Oct 15, 2012 at 07:55:34PM +0200, Michael S. Tsirkin wrote:

We copy head count to a 16 bit field,
this works by chance on LE but on BE
guest gets 0. Fix it up.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Tested-by: Alexander Graf <redacted>
Cc: stable@kernel.org

Ping. Dave, could you apply this to -net please?

From: "Michael S. Tsirkin" <mst@redhat.com>
Date: Sun, 21 Oct 2012 14:49:01 +0200

On Mon, Oct 15, 2012 at 07:55:34PM +0200, Michael S. Tsirkin wrote:

quoted

We copy head count to a 16 bit field,
this works by chance on LE but on BE
guest gets 0. Fix it up.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Tested-by: Alexander Graf <redacted>
Cc: stable@kernel.org

Ping. Dave, could you apply this to -net please?

Pinging me but not cc:'ing me?  That's really strange.

What if I operate by just mass deleting things that I'm
not explicitly on the To: or CC: when I'm very backlogged?

On Sun, Oct 21, 2012 at 07:24:02PM -0400, David Miller wrote:

From: "Michael S. Tsirkin" <mst@redhat.com>
Date: Sun, 21 Oct 2012 14:49:01 +0200

quoted

On Mon, Oct 15, 2012 at 07:55:34PM +0200, Michael S. Tsirkin wrote:

quoted

We copy head count to a 16 bit field,
this works by chance on LE but on BE
guest gets 0. Fix it up.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Tested-by: Alexander Graf <redacted>
Cc: stable@kernel.org

Ping. Dave, could you apply this to -net please?

Pinging me but not cc:'ing me?  That's really strange.

What if I operate by just mass deleting things that I'm
not explicitly on the To: or CC: when I'm very backlogged?

Yes, that was silly. Would you like me to repost the patch?

-- 
MST

From: "Michael S. Tsirkin" <mst@redhat.com>
Date: Wed, 24 Oct 2012 18:24:38 +0200

Would you like me to repost the patch?

This question is almost retorical.

I said I don't reliably read things I'm not explicitly CC:'d
on, therefore it's possible (and in fact, likely) I don't have
the patch in my inbox.

What do you think you should do?