diff options
| author |   Marcel Holtmann <marcel@holtmann.org> | 2013-10-13 03:57:38 -0700 |
|---|---|---|
| committer |   Johan Hedberg <johan.hedberg@intel.com> | 2013-10-13 17:45:55 +0300 |
| commit | 79d95a19a445f5758571b3342064f2c1e40b6c5f (patch) | |
| tree | 0d754ad5b9675344a2b014bf88dfaae4b2c7fe39 /net/bluetooth/mgmt.c | |
| parent | Bluetooth: Remove l2cap_conn->src and l2cap_conn->dst pointers (diff) | |
| download | linux-dev-79d95a19a445f5758571b3342064f2c1e40b6c5f.tar.xz linux-dev-79d95a19a445f5758571b3342064f2c1e40b6c5f.zip | |
Bluetooth: Remove pointless bdaddr_to_le() helper function
The bdaddr_to_le() function tries to convert the internal address
type to one that matches the HCI address type for LE. It does not
handle any address types not used by LE and in the end just make
the code a lot harder to read.
So instead of just hiding behind a magic function, just convert
the internal address type where it needs to be converted. And it
turns out that these are only two cases anyway. One when creating
new LE connections and the other when loading the long term keys.
In both cases this makes it more clear on what it going on.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net/bluetooth/mgmt.c')
| -rw-r--r-- | net/bluetooth/mgmt.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 338878c13571..020f95b84b09 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -3678,15 +3678,19 @@ static int load_long_term_keys(struct sock *sk, struct hci_dev *hdev, for (i = 0; i < key_count; i++) { struct mgmt_ltk_info *key = &cp->keys[i]; - u8 type; + u8 type, addr_type; + + if (key->addr.type == BDADDR_LE_PUBLIC) + addr_type = ADDR_LE_DEV_PUBLIC; + else + addr_type = ADDR_LE_DEV_RANDOM; if (key->master) type = HCI_SMP_LTK; else type = HCI_SMP_LTK_SLAVE; - hci_add_ltk(hdev, &key->addr.bdaddr, - bdaddr_to_le(key->addr.type), + hci_add_ltk(hdev, &key->addr.bdaddr, addr_type, type, 0, key->authenticated, key->val, key->enc_size, key->ediv, key->rand); } |