summaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorAl Viro2014-04-07 03:51:23 +0200
committerAl Viro2014-11-24 10:28:51 +0100
commit7eab8d9e8a722ca07bc785f73e21c3d3418defa6 (patch)
treef42c78986668929d2a2b05d88c94a36dab7c1a36 /net/ipv4
parentswitch ipxrtr_route_packet() from iovec to msghdr (diff)
downloadkernel-qcow2-linux-7eab8d9e8a722ca07bc785f73e21c3d3418defa6.tar.gz
kernel-qcow2-linux-7eab8d9e8a722ca07bc785f73e21c3d3418defa6.tar.xz
kernel-qcow2-linux-7eab8d9e8a722ca07bc785f73e21c3d3418defa6.zip
new helper: memcpy_to_msg()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/tcp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index c239f4740d10..435443bfc3c3 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1349,7 +1349,7 @@ static int tcp_recv_urg(struct sock *sk, struct msghdr *msg, int len, int flags)
if (len > 0) {
if (!(flags & MSG_TRUNC))
- err = memcpy_toiovec(msg->msg_iov, &c, 1);
+ err = memcpy_to_msg(msg, &c, 1);
len = 1;
} else
msg->msg_flags |= MSG_TRUNC;