diff options
| author | Vinicius Costa Gomes | 2011-07-07 23:59:42 +0200 |
|---|---|---|
| committer | Gustavo F. Padovan | 2011-07-08 22:37:22 +0200 |
| commit | 0eb08e339836989557ea3aa4c427377bd32ce19c (patch) | |
| tree | e134d10f61d921f0fff231aea8778ef2a27c130b | |
| parent | Bluetooth: Use the stored LTK for restabilishing security (diff) | |
| download | kernel-qcow2-linux-0eb08e339836989557ea3aa4c427377bd32ce19c.tar.gz kernel-qcow2-linux-0eb08e339836989557ea3aa4c427377bd32ce19c.tar.xz kernel-qcow2-linux-0eb08e339836989557ea3aa4c427377bd32ce19c.zip | |
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>
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 1 | ||||
| -rw-r--r-- | net/bluetooth/smp.c | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 306430ef164b..4ff530e3892b 100644 --- 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 5b7217919202..a8b971b75a67 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) 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, |