aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/net/bluetooth/hci_core.h1
-rw-r--r--net/bluetooth/smp.c2
2 files changed, 0 insertions, 3 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 306430ef164..4ff530e3892 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -265,7 +265,6 @@ struct hci_conn {
265 __u8 power_save; 265 __u8 power_save;
266 __u16 disc_timeout; 266 __u16 disc_timeout;
267 unsigned long pend; 267 unsigned long pend;
268 __u8 ltk[16];
269 268
270 __u8 remote_cap; 269 __u8 remote_cap;
271 __u8 remote_oob; 270 __u8 remote_oob;
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 5b721791920..a8b971b75a6 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -367,8 +367,6 @@ static u8 smp_cmd_pairing_random(struct l2cap_conn *conn, struct sk_buff *skb)
367 swap128(skb->data, random); 367 swap128(skb->data, random);
368 skb_pull(skb, sizeof(random)); 368 skb_pull(skb, sizeof(random));
369 369
370 memset(hcon->ltk, 0, sizeof(hcon->ltk));
371
372 if (conn->hcon->out) 370 if (conn->hcon->out)
373 ret = smp_c1(tfm, conn->tk, random, conn->preq, conn->prsp, 0, 371 ret = smp_c1(tfm, conn->tk, random, conn->preq, conn->prsp, 0,
374 conn->src, conn->hcon->dst_type, conn->dst, 372 conn->src, conn->hcon->dst_type, conn->dst,