diff options
| author | David S. Miller <davem@davemloft.net> | 2014-11-25 20:02:51 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-25 20:02:51 -0500 |
| commit | d3fc6b3fddd54c2220a075aefc4e5e5ca25cff34 (patch) | |
| tree | 794bd9737e15ecc636e2e3ef4c060c8e24488ca3 /net/ipv4/udp.c | |
| parent | aa99c47933d2c9a7622440d1b08ebb46ad8bd741 (diff) | |
| parent | 083735f4b01b703184c0e11c2e384b2c60a8aea4 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
More work from Al Viro to move away from modifying iovecs
by using iov_iter instead.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/udp.c')
| -rw-r--r-- | net/ipv4/udp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 4a16b9129079..b2d606833ce4 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -1284,9 +1284,8 @@ try_again: err = skb_copy_datagram_msg(skb, sizeof(struct udphdr), msg, copied); else { - err = skb_copy_and_csum_datagram_iovec(skb, - sizeof(struct udphdr), - msg->msg_iov); + err = skb_copy_and_csum_datagram_msg(skb, sizeof(struct udphdr), + msg); if (err == -EINVAL) goto csum_copy_err; |