Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux-2.6-microblaze.git] / net / bluetooth / smp.h

diff --git a/net/bluetooth/smp.h b/net/bluetooth/smp.h
index fc35a8b..87a59ec 100644 (file)
--- a/net/bluetooth/smp.h
+++ b/net/bluetooth/smp.h
@@ -79,8 +79,8 @@ struct smp_cmd_encrypt_info {
        __u8    ltk[16];
 } __packed;
 
-#define SMP_CMD_MASTER_IDENT   0x07
-struct smp_cmd_master_ident {
+#define SMP_CMD_INITIATOR_IDENT        0x07
+struct smp_cmd_initiator_ident {
        __le16  ediv;
        __le64  rand;
 } __packed;
@@ -146,7 +146,7 @@ struct smp_cmd_keypress_notify {
 enum {
        SMP_STK,
        SMP_LTK,
-       SMP_LTK_SLAVE,
+       SMP_LTK_RESPONDER,
        SMP_LTK_P256,
        SMP_LTK_P256_DEBUG,
 };