aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/l2cap_sock.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-11-24 16:44:09 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2014-12-09 16:28:23 -0500
commit56c39fb67cdb665ae67fba4975f5e20e6614cda6 (patch)
treed28b2a45a5892284bd8a11f97387f94002008599 /net/bluetooth/l2cap_sock.c
parentf4362a2c9524678f0459cf410403f8595e5cfce5 (diff)
switch l2cap ->memcpy_fromiovec() to msghdr
it'll die soon enough - now that kvec-backed iov_iter works regardless of set_fs(), both instances will become copy_from_iter() as soon as we introduce ->msg_iter... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'net/bluetooth/l2cap_sock.c')
-rw-r--r--net/bluetooth/l2cap_sock.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index b0efb7202957..205b298d9efb 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -1338,9 +1338,9 @@ static struct sk_buff *l2cap_sock_alloc_skb_cb(struct l2cap_chan *chan,
1338 1338
1339static int l2cap_sock_memcpy_fromiovec_cb(struct l2cap_chan *chan, 1339static int l2cap_sock_memcpy_fromiovec_cb(struct l2cap_chan *chan,
1340 unsigned char *kdata, 1340 unsigned char *kdata,
1341 struct iovec *iov, int len) 1341 struct msghdr *msg, int len)
1342{ 1342{
1343 return memcpy_fromiovec(kdata, iov, len); 1343 return memcpy_from_msg(kdata, msg, len);
1344} 1344}
1345 1345
1346static void l2cap_sock_ready_cb(struct l2cap_chan *chan) 1346static void l2cap_sock_ready_cb(struct l2cap_chan *chan)