aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-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 641ce8b69d2a..414c5151aa46 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -584,7 +584,6 @@ static struct smp_chan *smp_chan_create(struct l2cap_conn *conn)
584 584
585 smp->conn = conn; 585 smp->conn = conn;
586 conn->smp_chan = smp; 586 conn->smp_chan = smp;
587 conn->hcon->smp_conn = conn;
588 587
589 hci_conn_hold(conn->hcon); 588 hci_conn_hold(conn->hcon);
590 589
@@ -626,13 +625,12 @@ void smp_chan_destroy(struct l2cap_conn *conn)
626 625
627 kfree(smp); 626 kfree(smp);
628 conn->smp_chan = NULL; 627 conn->smp_chan = NULL;
629 conn->hcon->smp_conn = NULL;
630 hci_conn_drop(conn->hcon); 628 hci_conn_drop(conn->hcon);
631} 629}
632 630
633int smp_user_confirm_reply(struct hci_conn *hcon, u16 mgmt_op, __le32 passkey) 631int smp_user_confirm_reply(struct hci_conn *hcon, u16 mgmt_op, __le32 passkey)
634{ 632{
635 struct l2cap_conn *conn = hcon->smp_conn; 633 struct l2cap_conn *conn = hcon->l2cap_data;
636 struct smp_chan *smp; 634 struct smp_chan *smp;
637 u32 value; 635 u32 value;
638 636