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

[pandora-kernel.git] / net / bluetooth / smp.c

diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 5b72179..391888b 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,
@@ -403,6 +401,7 @@ static u8 smp_cmd_pairing_random(struct l2cap_conn *conn, struct sk_buff *skb)
                                SMP_MAX_ENC_KEY_SIZE - conn->smp_key_size);
 
                hci_le_start_enc(hcon, ediv, rand, stk);
+               hcon->enc_key_size = conn->smp_key_size;
        } else {
                u8 stk[16], r[16], rand[8];
                __le16 ediv;
@@ -419,7 +418,8 @@ static u8 smp_cmd_pairing_random(struct l2cap_conn *conn, struct sk_buff *skb)
                memset(stk + conn->smp_key_size, 0,
                                SMP_MAX_ENC_KEY_SIZE - conn->smp_key_size);
 
-               hci_add_ltk(conn->hcon->hdev, 0, conn->dst, ediv, rand, stk);
+               hci_add_ltk(conn->hcon->hdev, 0, conn->dst, conn->smp_key_size,
+                                                       ediv, rand, stk);
        }
 
        return 0;
@@ -489,6 +489,8 @@ int smp_conn_security(struct l2cap_conn *conn, __u8 sec_level)
 
                        hci_le_start_enc(hcon, master->ediv, master->rand,
                                                                key->val);
+                       hcon->enc_key_size = key->pin_len;
+
                        goto done;
                }
 
@@ -530,8 +532,8 @@ static int smp_cmd_master_ident(struct l2cap_conn *conn, struct sk_buff *skb)
 
        skb_pull(skb, sizeof(*rp));
 
-       hci_add_ltk(conn->hcon->hdev, 1, conn->src, rp->ediv,
-                                               rp->rand, conn->tk);
+       hci_add_ltk(conn->hcon->hdev, 1, conn->src, conn->smp_key_size,
+                                               rp->ediv, rp->rand, conn->tk);
 
        smp_distribute_keys(conn, 1);
 
@@ -656,8 +658,8 @@ int smp_distribute_keys(struct l2cap_conn *conn, __u8 force)
 
                smp_send_cmd(conn, SMP_CMD_ENCRYPT_INFO, sizeof(enc), &enc);
 
-               hci_add_ltk(conn->hcon->hdev, 1, conn->dst, ediv,
-                                                       ident.rand, enc.ltk);
+               hci_add_ltk(conn->hcon->hdev, 1, conn->dst, conn->smp_key_size,
+                                               ediv, ident.rand, enc.ltk);
 
                ident.ediv = cpu_to_le16(ediv);