lkml.org 
[lkml]   [2013]   [Dec]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the net-next tree with the net tree
Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/net/macvtap.c between commit ce232ce01d61 ("macvtap: signal
truncated packets") from the net tree and commit 55ec8e25cd97 ("macvtap:
remove unused parameter in macvtap_do_read()") from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc drivers/net/macvtap.c
index 2a89da080317,4a34bcb6549f..000000000000
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@@ -819,12 -813,13 +815,12 @@@ static ssize_t macvtap_put_user(struct
}

ret = skb_copy_datagram_const_iovec(skb, vlan_offset, iv, copied, len);
- copied += len;

done:
- return ret ? ret : copied;
+ return ret ? ret : total;
}

- static ssize_t macvtap_do_read(struct macvtap_queue *q, struct kiocb *iocb,
+ static ssize_t macvtap_do_read(struct macvtap_queue *q,
const struct iovec *iv, unsigned long len,
int noblock)
{
@@@ -875,8 -870,8 +871,8 @@@ static ssize_t macvtap_aio_read(struct
goto out;
}

- ret = macvtap_do_read(q, iocb, iv, len, file->f_flags & O_NONBLOCK);
+ ret = macvtap_do_read(q, iv, len, file->f_flags & O_NONBLOCK);
- ret = min_t(ssize_t, ret, len); /* XXX copied from tun.c. Why? */
+ ret = min_t(ssize_t, ret, len);
if (ret > 0)
iocb->ki_pos = ret;
out:
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2013-12-12 01:41    [W:0.076 / U:0.180 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site