Commit 2908fe31 authored by Johan Hedberg's avatar Johan Hedberg Committed by Gustavo Padovan
Browse files

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: default avatarJohan Hedberg <johan.hedberg@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 92da6097

include/net/bluetooth/hci.h

+0 −1
Original line number Diff line number Diff line
@@ -119,7 +119,6 @@ enum { 
	HCI_CONNECTABLE,

	HCI_DISCOVERABLE,

	HCI_LINK_SECURITY,

	HCI_PENDING_CLASS,

	HCI_PERIODIC_INQ,

};

net/bluetooth/hci_event.c

+1 −2
Original line number Diff line number Diff line
@@ -194,8 +194,7 @@ static void hci_cc_reset(struct hci_dev *hdev, struct sk_buff *skb) 
	clear_bit(HCI_RESET, &hdev->flags);



	/* Reset all non-persistent flags */

	hdev->dev_flags &= ~(BIT(HCI_LE_SCAN) | BIT(HCI_PENDING_CLASS) |

			     BIT(HCI_PERIODIC_INQ));

	hdev->dev_flags &= ~(BIT(HCI_LE_SCAN) | BIT(HCI_PERIODIC_INQ));



	hdev->discovery.state = DISCOVERY_STOPPED;

	hdev->inq_tx_power = HCI_TX_POWER_INVALID;

net/bluetooth/mgmt.c

+0 −4
Original line number Diff line number Diff line
@@ -652,8 +652,6 @@ static void update_class(struct hci_request *req) 
		return;



	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)
@@ -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) };

	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_ADD_UUID, hdev, sk_lookup, &match);

	mgmt_pending_foreach(MGMT_OP_REMOVE_UUID, hdev, sk_lookup, &match);

CRA Git | Maintained and supported by SUSTech CRA and CCSE