Bluetooth: Remove unused field in hci_conn

Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@openbossa.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 306430ef164bf8b4bbc987ff5ffda6d44dbc2fe0..4ff530e3892bec1b9708a0514bc2ea7ea507e0fb 100644 (file)
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -265,7 +265,6 @@ struct hci_conn {
        __u8            power_save;
        __u16           disc_timeout;
        unsigned long   pend;
-       __u8            ltk[16];
 
        __u8            remote_cap;
        __u8            remote_oob;

diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 5b7217919202acb0588b2809b77538abf57a2645..a8b971b75a67a7f4c2a5675e5ebebb888cfe5245 100644 (file)
--- 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)
        swap128(skb->data, random);
        skb_pull(skb, sizeof(random));
 
-       memset(hcon->ltk, 0, sizeof(hcon->ltk));
-
        if (conn->hcon->out)
                ret = smp_c1(tfm, conn->tk, random, conn->preq, conn->prsp, 0,
                                conn->src, conn->hcon->dst_type, conn->dst,