Bluetooth: Remove LTK re-encryption procedure

Due to several devices being unable to handle this procedure reliably
(resulting in forced disconnections before pairing completes) it's
better to remove it altogether.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

1 files changed, 2 insertions, 6 deletions

diff --git a/net/bluetooth/smp.h b/net/bluetooth/smp.h
index 0d536b8b3f9a..1277147a9150 100644
--- a/net/bluetooth/smp.h
+++ b/net/bluetooth/smp.h
@@ -118,11 +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_FLAG_INITIATOR      6
-
-#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;
@@ -145,7 +142,6 @@ struct smp_chan {
         unsigned long   smp_flags;
         struct work_struct confirm;
         struct work_struct random;
-        struct delayed_work reencrypt;
 };
 
 /* SMP Commands */