Bluetooth: Add mgmt_pair_device command

This patch adds a new mgmt_pair_device which can be used to initiate a
dedicated bonding procedure. Some extra callbacks are added to the
hci_conn struct so that the pairing code can get notified of the
completion of the procedure.

Signed-off-by: Johan Hedberg <johan.hedberg@nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

2 files changed, 28 insertions, 0 deletions

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index d5d8454236bf..506f25089207 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -248,6 +248,10 @@ struct hci_conn {
         void            *priv;
 
         struct hci_conn *link;
+
+        void (*connect_cfm_cb)  (struct hci_conn *conn, u8 status);
+        void (*security_cfm_cb) (struct hci_conn *conn, u8 status);
+        void (*disconn_cfm_cb)  (struct hci_conn *conn, u8 reason);
 };
 
 extern struct hci_proto *hci_proto[];
@@ -571,6 +575,9 @@ static inline void hci_proto_connect_cfm(struct hci_conn *conn, __u8 status)
         hp = hci_proto[HCI_PROTO_SCO];
         if (hp && hp->connect_cfm)
                 hp->connect_cfm(conn, status);
+
+        if (conn->connect_cfm_cb)
+                conn->connect_cfm_cb(conn, status);
 }
 
 static inline int hci_proto_disconn_ind(struct hci_conn *conn)
@@ -600,6 +607,9 @@ static inline void hci_proto_disconn_cfm(struct hci_conn *conn, __u8 reason)
         hp = hci_proto[HCI_PROTO_SCO];
         if (hp && hp->disconn_cfm)
                 hp->disconn_cfm(conn, reason);
+
+        if (conn->disconn_cfm_cb)
+                conn->disconn_cfm_cb(conn, reason);
 }
 
 static inline void hci_proto_auth_cfm(struct hci_conn *conn, __u8 status)
@@ -619,6 +629,9 @@ static inline void hci_proto_auth_cfm(struct hci_conn *conn, __u8 status)
         hp = hci_proto[HCI_PROTO_SCO];
         if (hp && hp->security_cfm)
                 hp->security_cfm(conn, status, encrypt);
+
+        if (conn->security_cfm_cb)
+                conn->security_cfm_cb(conn, status);
 }
 
 static inline void hci_proto_encrypt_cfm(struct hci_conn *conn, __u8 status, __u8 encrypt)
@@ -632,6 +645,9 @@ static inline void hci_proto_encrypt_cfm(struct hci_conn *conn, __u8 status, __u
         hp = hci_proto[HCI_PROTO_SCO];
         if (hp && hp->security_cfm)
                 hp->security_cfm(conn, status, encrypt);
+
+        if (conn->security_cfm_cb)
+                conn->security_cfm_cb(conn, status);
 }
 
 int hci_register_proto(struct hci_proto *hproto);
diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index 44ac55c85079..1d25c59be2e3 100644
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
@@ -160,6 +160,18 @@ struct mgmt_cp_set_io_capability {
         __u8 io_capability;
 } __packed;
 
+#define MGMT_OP_PAIR_DEVICE             0x0014
+struct mgmt_cp_pair_device {
+        __le16 index;
+        bdaddr_t bdaddr;
+        __u8 io_cap;
+} __packed;
+struct mgmt_rp_pair_device {
+        __le16 index;
+        bdaddr_t bdaddr;
+        __u8 status;
+} __packed;
+
 #define MGMT_EV_CMD_COMPLETE            0x0001
 struct mgmt_ev_cmd_complete {
         __le16 opcode;