aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/smp.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/bluetooth/smp.c')
-rw-r--r--net/bluetooth/smp.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 21f555b4df17..de7dc7581ff0 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -268,7 +268,7 @@ static void smp_send_cmd(struct l2cap_conn *conn, u8 code, u16 len, void *data)
268 268
269 memset(&msg, 0, sizeof(msg)); 269 memset(&msg, 0, sizeof(msg));
270 270
271 iov_iter_init(&msg.msg_iter, WRITE, (struct iovec *)iv, 2, 1 + len); 271 iov_iter_kvec(&msg.msg_iter, WRITE | ITER_KVEC, iv, 2, 1 + len);
272 272
273 l2cap_chan_send(chan, &msg, 1 + len); 273 l2cap_chan_send(chan, &msg, 1 + len);
274 274
@@ -1629,7 +1629,6 @@ static const struct l2cap_ops smp_chan_ops = {
1629 .suspend = l2cap_chan_no_suspend, 1629 .suspend = l2cap_chan_no_suspend,
1630 .set_shutdown = l2cap_chan_no_set_shutdown, 1630 .set_shutdown = l2cap_chan_no_set_shutdown,
1631 .get_sndtimeo = l2cap_chan_no_get_sndtimeo, 1631 .get_sndtimeo = l2cap_chan_no_get_sndtimeo,
1632 .memcpy_fromiovec = l2cap_chan_no_memcpy_fromiovec,
1633}; 1632};
1634 1633
1635static inline struct l2cap_chan *smp_new_conn_cb(struct l2cap_chan *pchan) 1634static inline struct l2cap_chan *smp_new_conn_cb(struct l2cap_chan *pchan)
@@ -1678,7 +1677,6 @@ static const struct l2cap_ops smp_root_chan_ops = {
1678 .resume = l2cap_chan_no_resume, 1677 .resume = l2cap_chan_no_resume,
1679 .set_shutdown = l2cap_chan_no_set_shutdown, 1678 .set_shutdown = l2cap_chan_no_set_shutdown,
1680 .get_sndtimeo = l2cap_chan_no_get_sndtimeo, 1679 .get_sndtimeo = l2cap_chan_no_get_sndtimeo,
1681 .memcpy_fromiovec = l2cap_chan_no_memcpy_fromiovec,
1682}; 1680};
1683 1681
1684int smp_register(struct hci_dev *hdev) 1682int smp_register(struct hci_dev *hdev)