lkml.org 
[lkml]   [2015]   [Feb]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH net] vhost_net: fix wrong iter offset when setting number of buffers
From
From: Jason Wang <jasowang@redhat.com>
Date: Sun, 15 Feb 2015 16:35:17 +0800

> In commit ba7438aed924 ("vhost: don't bother copying iovecs in
> handle_rx(), kill memcpy_toiovecend()"), we advance iov iter fixup
> sizeof(struct virtio_net_hdr) bytes and fill the number of buffers
> after doing the socket recvmsg(). This work well but was broken after
> commit 6e03f896b52c ("Merge
> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net") which tries
> to advance sizeof(struct virtio_net_hdr_mrg_rxbuf). It will fill the
> number of buffers at the wrong place. This patch fixes this.
>
> Fixes 6e03f896b52c
> ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net")
> Cc: David S. Miller <davem@davemloft.net>
> Cc: Al Viro <viro@zeniv.linux.org.uk>
> Cc: Michael S. Tsirkin <mst@redhat.com>
> Signed-off-by: Jason Wang <jasowang@redhat.com>

I was wondering if I got that merge conflict right. :-/

Applied, thanks Jason.


\
 
 \ /
  Last update: 2015-02-15 17:21    [W:0.026 / U:7.048 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site