Bluetooth: Remove unneeded mgmt_write_scan_failed function
The Set Connectable/Discoverable mgmt handlers use a hci_request with a proper callback to handle the HCI command sending. It makes therefore little sense to have this extra function to be called from hci_event.c for command failures. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Родитель
bc6d2d0418
Коммит
13a779e422
|
@ -1288,7 +1288,6 @@ void mgmt_set_powered_failed(struct hci_dev *hdev, int err);
|
|||
int mgmt_powered(struct hci_dev *hdev, u8 powered);
|
||||
int mgmt_update_adv_data(struct hci_dev *hdev);
|
||||
void mgmt_discoverable_timeout(struct hci_dev *hdev);
|
||||
void mgmt_write_scan_failed(struct hci_dev *hdev, u8 scan, u8 status);
|
||||
void mgmt_new_link_key(struct hci_dev *hdev, struct link_key *key,
|
||||
bool persistent);
|
||||
void mgmt_device_connected(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
|
||||
|
|
|
@ -309,7 +309,6 @@ static void hci_cc_write_scan_enable(struct hci_dev *hdev, struct sk_buff *skb)
|
|||
hci_dev_lock(hdev);
|
||||
|
||||
if (status) {
|
||||
mgmt_write_scan_failed(hdev, param, status);
|
||||
hdev->discov_timeout = 0;
|
||||
goto done;
|
||||
}
|
||||
|
|
|
@ -6049,19 +6049,6 @@ void mgmt_discoverable_timeout(struct hci_dev *hdev)
|
|||
hci_dev_unlock(hdev);
|
||||
}
|
||||
|
||||
void mgmt_write_scan_failed(struct hci_dev *hdev, u8 scan, u8 status)
|
||||
{
|
||||
u8 mgmt_err = mgmt_status(status);
|
||||
|
||||
if (scan & SCAN_PAGE)
|
||||
mgmt_pending_foreach(MGMT_OP_SET_CONNECTABLE, hdev,
|
||||
cmd_status_rsp, &mgmt_err);
|
||||
|
||||
if (scan & SCAN_INQUIRY)
|
||||
mgmt_pending_foreach(MGMT_OP_SET_DISCOVERABLE, hdev,
|
||||
cmd_status_rsp, &mgmt_err);
|
||||
}
|
||||
|
||||
void mgmt_new_link_key(struct hci_dev *hdev, struct link_key *key,
|
||||
bool persistent)
|
||||
{
|
||||
|
|
Загрузка…
Ссылка в новой задаче