diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-02-24 15:04:35 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-02-24 15:04:35 -0500 |
| commit | db18014f65f62879e70be55898be3fd68a3363a8 (patch) | |
| tree | 90d5e33852753f43d76d25f8d22a64a9e5bd94e8 /net/bluetooth/smp.h | |
| parent | c77986c78aa941af8266272841567e78b72d54cc (diff) | |
| parent | 668b7b19820b0801c425d31cc27fd6f499050e5c (diff) | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'net/bluetooth/smp.h')
| -rw-r--r-- | net/bluetooth/smp.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/net/bluetooth/smp.h b/net/bluetooth/smp.h index a700bcb490d7..d8cc543f523c 100644 --- a/net/bluetooth/smp.h +++ b/net/bluetooth/smp.h @@ -118,6 +118,7 @@ struct smp_cmd_security_req { #define SMP_FLAG_TK_VALID 1 #define SMP_FLAG_CFM_PENDING 2 #define SMP_FLAG_MITM_AUTH 3 +#define SMP_FLAG_COMPLETE 4 struct smp_chan { struct l2cap_conn *conn; @@ -128,11 +129,16 @@ struct smp_chan { u8 pcnf[16]; /* SMP Pairing Confirm */ u8 tk[16]; /* SMP Temporary Key */ u8 enc_key_size; + u8 remote_key_dist; + bdaddr_t id_addr; + u8 id_addr_type; + u8 irk[16]; + struct smp_ltk *ltk; + struct smp_ltk *slave_ltk; + struct smp_irk *remote_irk; unsigned long smp_flags; - struct crypto_blkcipher *tfm; struct work_struct confirm; struct work_struct random; - }; /* SMP Commands */ @@ -144,4 +150,7 @@ int smp_user_confirm_reply(struct hci_conn *conn, u16 mgmt_op, __le32 passkey); void smp_chan_destroy(struct l2cap_conn *conn); +bool smp_irk_matches(struct crypto_blkcipher *tfm, u8 irk[16], + bdaddr_t *bdaddr); + #endif /* __SMP_H */ |