Commit f8867016 authored by Luiz Augusto von Dentz's avatar Luiz Augusto von Dentz
Browse files

Bluetooth: hci_core: Make hci_is_le_conn_scanning public 



This moves hci_is_le_conn_scanning to hci_core.h so it can be used by
different files without having to duplicate its code.

Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent f2f84a70

include/net/bluetooth/hci_core.h

+21 −0
Original line number Diff line number Diff line
@@ -1372,6 +1372,27 @@ static inline struct hci_conn *hci_lookup_le_connect(struct hci_dev *hdev) 
	return NULL;

}



/* Returns true if an le connection is in the scanning state */

static inline bool hci_is_le_conn_scanning(struct hci_dev *hdev)

{

	struct hci_conn_hash *h = &hdev->conn_hash;

	struct hci_conn  *c;



	rcu_read_lock();



	list_for_each_entry_rcu(c, &h->list, list) {

		if (c->type == LE_LINK && c->state == BT_CONNECT &&

		    test_bit(HCI_CONN_SCANNING, &c->flags)) {

			rcu_read_unlock();

			return true;

		}

	}



	rcu_read_unlock();



	return false;

}



int hci_disconnect(struct hci_conn *conn, __u8 reason);

bool hci_setup_sync(struct hci_conn *conn, __u16 handle);

void hci_sco_setup(struct hci_conn *conn, __u8 status);

net/bluetooth/hci_request.c

+0 −21
Original line number Diff line number Diff line
@@ -629,27 +629,6 @@ static void hci_req_start_scan(struct hci_request *req, u8 type, u16 interval, 
	}

}



/* Returns true if an le connection is in the scanning state */

static inline bool hci_is_le_conn_scanning(struct hci_dev *hdev)

{

	struct hci_conn_hash *h = &hdev->conn_hash;

	struct hci_conn  *c;



	rcu_read_lock();



	list_for_each_entry_rcu(c, &h->list, list) {

		if (c->type == LE_LINK && c->state == BT_CONNECT &&

		    test_bit(HCI_CONN_SCANNING, &c->flags)) {

			rcu_read_unlock();

			return true;

		}

	}



	rcu_read_unlock();



	return false;

}



static void set_random_addr(struct hci_request *req, bdaddr_t *rpa);

static int hci_update_random_address(struct hci_request *req,

				     bool require_privacy, bool use_rpa,

net/bluetooth/hci_sync.c

+0 −21
Original line number Diff line number Diff line
@@ -2672,27 +2672,6 @@ static u8 hci_update_accept_list_sync(struct hci_dev *hdev) 
	return filter_policy;

}



/* Returns true if an le connection is in the scanning state */

static inline bool hci_is_le_conn_scanning(struct hci_dev *hdev)

{

	struct hci_conn_hash *h = &hdev->conn_hash;

	struct hci_conn  *c;



	rcu_read_lock();



	list_for_each_entry_rcu(c, &h->list, list) {

		if (c->type == LE_LINK && c->state == BT_CONNECT &&

		    test_bit(HCI_CONN_SCANNING, &c->flags)) {

			rcu_read_unlock();

			return true;

		}

	}



	rcu_read_unlock();



	return false;

}



static int hci_le_set_ext_scan_param_sync(struct hci_dev *hdev, u8 type,

					  u16 interval, u16 window,

					  u8 own_addr_type, u8 filter_policy)