Merge tag 'dt-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[cascardo/linux.git] / net / bluetooth / smp.h

diff --git a/net/bluetooth/smp.h b/net/bluetooth/smp.h
index b691347..1277147 100644 (file)
--- a/net/bluetooth/smp.h
+++ b/net/bluetooth/smp.h
@@ -118,10 +118,8 @@ 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_LTK_ENCRYPT   4
-#define SMP_FLAG_COMPLETE      5
-
-#define SMP_REENCRYPT_TIMEOUT  msecs_to_jiffies(500)
+#define SMP_FLAG_COMPLETE      4
+#define SMP_FLAG_INITIATOR     5
 
 struct smp_chan {
        struct l2cap_conn *conn;
@@ -144,7 +142,6 @@ struct smp_chan {
        unsigned long   smp_flags;
        struct work_struct confirm;
        struct work_struct random;
-       struct delayed_work reencrypt;
 };
 
 /* SMP Commands */