diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2014-11-24 17:07:38 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-12-09 16:29:10 -0500 |
commit | 17836394e578b8d6475ecdb309ad1356bbcf37a2 (patch) | |
tree | 0a96321812719cff97012d161bcdf4d47b4740ea /net/bluetooth/a2mp.c | |
parent | c0371da6047abd261bc483c744dbc7d81a116172 (diff) |
first fruits - kill l2cap ->memcpy_fromiovec()
Just use copy_from_iter(). That's what this method is trying to do
in all cases, in a very convoluted fashion.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'net/bluetooth/a2mp.c')
-rw-r--r-- | net/bluetooth/a2mp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/bluetooth/a2mp.c b/net/bluetooth/a2mp.c index 716d2a388858..cedfbda15dad 100644 --- a/net/bluetooth/a2mp.c +++ b/net/bluetooth/a2mp.c | |||
@@ -60,7 +60,7 @@ void a2mp_send(struct amp_mgr *mgr, u8 code, u8 ident, u16 len, void *data) | |||
60 | 60 | ||
61 | memset(&msg, 0, sizeof(msg)); | 61 | memset(&msg, 0, sizeof(msg)); |
62 | 62 | ||
63 | iov_iter_init(&msg.msg_iter, WRITE, (struct iovec *)&iv, 1, total_len); | 63 | iov_iter_kvec(&msg.msg_iter, WRITE | ITER_KVEC, &iv, 1, total_len); |
64 | 64 | ||
65 | l2cap_chan_send(chan, &msg, total_len); | 65 | l2cap_chan_send(chan, &msg, total_len); |
66 | 66 | ||
@@ -719,7 +719,6 @@ static const struct l2cap_ops a2mp_chan_ops = { | |||
719 | .resume = l2cap_chan_no_resume, | 719 | .resume = l2cap_chan_no_resume, |
720 | .set_shutdown = l2cap_chan_no_set_shutdown, | 720 | .set_shutdown = l2cap_chan_no_set_shutdown, |
721 | .get_sndtimeo = l2cap_chan_no_get_sndtimeo, | 721 | .get_sndtimeo = l2cap_chan_no_get_sndtimeo, |
722 | .memcpy_fromiovec = l2cap_chan_no_memcpy_fromiovec, | ||
723 | }; | 722 | }; |
724 | 723 | ||
725 | static struct l2cap_chan *a2mp_chan_open(struct l2cap_conn *conn, bool locked) | 724 | static struct l2cap_chan *a2mp_chan_open(struct l2cap_conn *conn, bool locked) |