Skip to content

Commit

Permalink
Bluetooth: Bind the SMP channel registration to management power state
Browse files Browse the repository at this point in the history
When the controller gets powered on via the management interface, then
register the supported SMP channels. There is no point in registering
these channels earlier since it is not know what identity address the
controller is going to operate with.

When powering down a controller unregister all SMP channels. This is
required since a powered down controller is allowed to change its
identity address.

In addition the SMP channels are only available when the controller
is powered via the management interface. When using legacy ioctl, then
Bluetooth Low Energy is not supported and registering kernel side SMP
integration may actually cause confusion.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
  • Loading branch information
Marcel Holtmann authored and Johan Hedberg committed Jan 15, 2015
1 parent 7e7ec44 commit 162a3ba
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
6 changes: 3 additions & 3 deletions net/bluetooth/hci_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -933,10 +933,8 @@ static int __hci_init(struct hci_dev *hdev)
if (lmp_bredr_capable(hdev))
hci_debugfs_create_bredr(hdev);

if (lmp_le_capable(hdev)) {
if (lmp_le_capable(hdev))
hci_debugfs_create_le(hdev);
smp_register(hdev);
}

return 0;
}
Expand Down Expand Up @@ -2133,6 +2131,8 @@ static void hci_power_off(struct work_struct *work)
BT_DBG("%s", hdev->name);

hci_dev_do_close(hdev);

smp_unregister(hdev);
}

static void hci_discov_off(struct work_struct *work)
Expand Down
9 changes: 9 additions & 0 deletions net/bluetooth/mgmt.c
Original file line number Diff line number Diff line change
Expand Up @@ -6232,6 +6232,15 @@ static void powered_complete(struct hci_dev *hdev, u8 status, u16 opcode)

BT_DBG("status 0x%02x", status);

if (!status) {
/* Register the available SMP channels (BR/EDR and LE) only
* when successfully powering on the controller. This late
* registration is required so that LE SMP can clearly
* decide if the public address or static address is used.
*/
smp_register(hdev);
}

hci_dev_lock(hdev);

mgmt_pending_foreach(MGMT_OP_SET_POWERED, hdev, settings_rsp, &match);
Expand Down

0 comments on commit 162a3ba

Please sign in to comment.