diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2014-08-11 22:06:36 +0300 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2014-08-14 08:49:21 +0200 |
| commit | 44f1a7ab51ebe1ca189445837e0599a5edc6efb1 (patch) | |
| tree | d9955a785be9fa69fa7f16c98195ff95b231c838 /net/bluetooth/l2cap_core.c | |
| parent | 89d2975fa06e66ea0d3665d91f799fb1ce4b8bad (diff) | |
| download | op-kernel-dev-44f1a7ab51ebe1ca189445837e0599a5edc6efb1.zip op-kernel-dev-44f1a7ab51ebe1ca189445837e0599a5edc6efb1.tar.gz | |
Bluetooth: Use L2CAP resume callback to call smp_distribute_keys
There's no need to export the smp_distribute_keys() function since the
resume callback is called in the same scenario. This patch makes the
smp_notify_keys function private (at the same time moving it higher up
in smp.c to avoid forward declarations) and adds a resume callback for
SMP to call it from there instead.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/l2cap_core.c')
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 40b6c06..4de1e18 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -7281,12 +7281,6 @@ int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt) BT_DBG("conn %p status 0x%2.2x encrypt %u", conn, status, encrypt); - if (hcon->type == LE_LINK) { - if (!status && encrypt) - smp_distribute_keys(conn); - cancel_delayed_work(&conn->security_timer); - } - mutex_lock(&conn->chan_lock); list_for_each_entry(chan, &conn->chan_l, list) { |
