diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2014-06-18 14:09:40 +0300 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2014-07-03 17:42:43 +0200 |
| commit | d97c9fb0c82afc6042004ed3f381d85ff31fadcc (patch) | |
| tree | 08e28240b8babc63638dc9fda9ebbc252d0af1f8 /net/bluetooth | |
| parent | 4ec86d4c86fe563482f183243f15bcd5fd3e65c5 (diff) | |
| download | lwn-d97c9fb0c82afc6042004ed3f381d85ff31fadcc.tar.gz lwn-d97c9fb0c82afc6042004ed3f381d85ff31fadcc.zip | |
Bluetooth: Fix checking for master LTKs
When the rename of STK_SLAVE to simply STK happened we missed this place
in the ltk_type_master function. Now, checking for master is as simple
as checking whether the type is SMP_LTK. The helper function is kept
around for better readability in the (right now three) callers and for
simpler extension with new key types in the future.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Tested-by: Lukasz Rymanowski <lukasz.rymanowski@tieto.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/hci_core.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 6001b9293905..c3d184fd24de 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -2974,10 +2974,7 @@ static bool hci_persistent_key(struct hci_dev *hdev, struct hci_conn *conn, static bool ltk_type_master(u8 type) { - if (type == SMP_STK || type == SMP_LTK) - return true; - - return false; + return (type == SMP_LTK); } struct smp_ltk *hci_find_ltk(struct hci_dev *hdev, __le16 ediv, __le64 rand, |