Bluetooth: Remove useless HCI_PENDING_CLASS flag
Now that class related operations are tracked through asynchronous HCI requests this flag is no longer needed. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
This commit is contained in:
parent
92da609750
commit
2908fe31cf
@ -119,7 +119,6 @@ enum {
|
|||||||
HCI_CONNECTABLE,
|
HCI_CONNECTABLE,
|
||||||
HCI_DISCOVERABLE,
|
HCI_DISCOVERABLE,
|
||||||
HCI_LINK_SECURITY,
|
HCI_LINK_SECURITY,
|
||||||
HCI_PENDING_CLASS,
|
|
||||||
HCI_PERIODIC_INQ,
|
HCI_PERIODIC_INQ,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -194,8 +194,7 @@ static void hci_cc_reset(struct hci_dev *hdev, struct sk_buff *skb)
|
|||||||
clear_bit(HCI_RESET, &hdev->flags);
|
clear_bit(HCI_RESET, &hdev->flags);
|
||||||
|
|
||||||
/* Reset all non-persistent flags */
|
/* Reset all non-persistent flags */
|
||||||
hdev->dev_flags &= ~(BIT(HCI_LE_SCAN) | BIT(HCI_PENDING_CLASS) |
|
hdev->dev_flags &= ~(BIT(HCI_LE_SCAN) | BIT(HCI_PERIODIC_INQ));
|
||||||
BIT(HCI_PERIODIC_INQ));
|
|
||||||
|
|
||||||
hdev->discovery.state = DISCOVERY_STOPPED;
|
hdev->discovery.state = DISCOVERY_STOPPED;
|
||||||
hdev->inq_tx_power = HCI_TX_POWER_INVALID;
|
hdev->inq_tx_power = HCI_TX_POWER_INVALID;
|
||||||
|
@ -652,8 +652,6 @@ static void update_class(struct hci_request *req)
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
hci_req_add(req, HCI_OP_WRITE_CLASS_OF_DEV, sizeof(cod), cod);
|
hci_req_add(req, HCI_OP_WRITE_CLASS_OF_DEV, sizeof(cod), cod);
|
||||||
|
|
||||||
set_bit(HCI_PENDING_CLASS, &hdev->dev_flags);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void service_cache_off(struct work_struct *work)
|
static void service_cache_off(struct work_struct *work)
|
||||||
@ -3762,8 +3760,6 @@ int mgmt_set_class_of_dev_complete(struct hci_dev *hdev, u8 *dev_class,
|
|||||||
struct cmd_lookup match = { NULL, hdev, mgmt_status(status) };
|
struct cmd_lookup match = { NULL, hdev, mgmt_status(status) };
|
||||||
int err = 0;
|
int err = 0;
|
||||||
|
|
||||||
clear_bit(HCI_PENDING_CLASS, &hdev->dev_flags);
|
|
||||||
|
|
||||||
mgmt_pending_foreach(MGMT_OP_SET_DEV_CLASS, hdev, sk_lookup, &match);
|
mgmt_pending_foreach(MGMT_OP_SET_DEV_CLASS, hdev, sk_lookup, &match);
|
||||||
mgmt_pending_foreach(MGMT_OP_ADD_UUID, hdev, sk_lookup, &match);
|
mgmt_pending_foreach(MGMT_OP_ADD_UUID, hdev, sk_lookup, &match);
|
||||||
mgmt_pending_foreach(MGMT_OP_REMOVE_UUID, hdev, sk_lookup, &match);
|
mgmt_pending_foreach(MGMT_OP_REMOVE_UUID, hdev, sk_lookup, &match);
|
||||||
|
Loading…
Reference in New Issue
Block a user