summaryrefslogtreecommitdiff
path: root/net/bluetooth/hci_event.c
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2014-06-16 19:25:15 +0300
committerMarcel Holtmann <marcel@holtmann.org>2014-07-03 17:42:42 +0200
commit7d5843b7b77cee26bd5e090bfa61780d75957648 (patch)
tree0616eacae3385d5f37aabad9dab6079a1f39adef /net/bluetooth/hci_event.c
parentc29d2444170a4e0709331e357a2738a02666a633 (diff)
Bluetooth: Remove unnecessary SMP STK define
We never store the "master" type of STKs since we request encryption directly with them so we only need one STK type (the one that's looked-up on the slave side). Simply remove the unnecessary define and rename the _SLAVE one to the shorter form. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/hci_event.c')
-rw-r--r--net/bluetooth/hci_event.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 3d52be1d695d..8dde40430b5f 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -4241,7 +4241,7 @@ static void hci_le_ltk_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
* distribute the keys. Later, security can be re-established
* using a distributed LTK.
*/
- if (ltk->type == HCI_SMP_STK_SLAVE) {
+ if (ltk->type == HCI_SMP_STK) {
list_del(&ltk->list);
kfree(ltk);
}