diff options
| author | Johan Hedberg <johan.hedberg@nokia.com> | 2011-01-28 23:54:52 +0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@nokia.com> | 2011-01-28 23:54:52 +0200 |
| commit | c614654d76da74a51a18c7d4474a8046ca6bda01 (patch) | |
| tree | 07fb4a90231d1da633943333c6128489c83b790b /plugins | |
| parent | b9efb73d372a913dc52b3ba216cb7ac8de9f4cbc (diff) | |
| download | bluez-c614654d76da74a51a18c7d4474a8046ca6bda01.tar.gz | |
hciops: Remove unnecessary conn->key_type
Since we always store the keys in runtime memory there's no need to have
a separate per-connection variable for the key type.
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/hciops.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/plugins/hciops.c b/plugins/hciops.c index 75de36aa9..a416c2506 100644 --- a/plugins/hciops.c +++ b/plugins/hciops.c @@ -77,7 +77,6 @@ struct bt_conn { uint8_t loc_auth; uint8_t rem_cap; uint8_t rem_auth; - uint8_t key_type; gboolean bonding_initiator; gboolean secmode3; GIOChannel *io; /* For raw L2CAP socket (bonding) */ @@ -646,7 +645,6 @@ static struct bt_conn *get_connection(struct dev_info *dev, bdaddr_t *bdaddr) conn->loc_cap = dev->io_capability; conn->loc_auth = 0xff; conn->rem_auth = 0xff; - conn->key_type = 0xff; bacpy(&conn->bdaddr, bdaddr); dev->connections = g_slist_append(dev->connections, conn); @@ -814,7 +812,7 @@ static void link_key_notify(int index, void *ptr) if (key_info == NULL) { key_info = g_new0(struct link_key_info, 1); bacpy(&key_info->bdaddr, &evt->bdaddr); - old_key_type = conn->key_type; + old_key_type = 0xff; } else { dev->keys = g_slist_remove(dev->keys, key_info); old_key_type = key_info->type; @@ -845,7 +843,6 @@ static void link_key_notify(int index, void *ptr) } key_info->type = key_type; - conn->key_type = key_type; /* Skip the storage check if this is a debug key */ if (key_type == 0x03) |