Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 416dc94b authored by Gustavo Padovan's avatar Gustavo Padovan
Browse files

Bluetooth: make hci_conn_enter_sniff_mode static 



It isn't used outside hci_conn.c

Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 3e9c40a6

include/net/bluetooth/hci_core.h

+0 −1
Original line number Diff line number Diff line
@@ -509,7 +509,6 @@ int hci_conn_change_link_key(struct hci_conn *conn); 
int hci_conn_switch_role(struct hci_conn *conn, __u8 role);



void hci_conn_enter_active_mode(struct hci_conn *conn, __u8 force_active);

void hci_conn_enter_sniff_mode(struct hci_conn *conn);



void hci_conn_hold_device(struct hci_conn *conn);

void hci_conn_put_device(struct hci_conn *conn);

net/bluetooth/hci_conn.c

+36 −36
Original line number Diff line number Diff line
@@ -311,6 +311,42 @@ static void hci_conn_timeout(unsigned long arg) 
	hci_dev_unlock(hdev);

}



/* Enter sniff mode */

static void hci_conn_enter_sniff_mode(struct hci_conn *conn)

{

	struct hci_dev *hdev = conn->hdev;



	BT_DBG("conn %p mode %d", conn, conn->mode);



	if (test_bit(HCI_RAW, &hdev->flags))

		return;



	if (!lmp_sniff_capable(hdev) || !lmp_sniff_capable(conn))

		return;



	if (conn->mode != HCI_CM_ACTIVE || !(conn->link_policy & HCI_LP_SNIFF))

		return;



	if (lmp_sniffsubr_capable(hdev) && lmp_sniffsubr_capable(conn)) {

		struct hci_cp_sniff_subrate cp;

		cp.handle             = cpu_to_le16(conn->handle);

		cp.max_latency        = cpu_to_le16(0);

		cp.min_remote_timeout = cpu_to_le16(0);

		cp.min_local_timeout  = cpu_to_le16(0);

		hci_send_cmd(hdev, HCI_OP_SNIFF_SUBRATE, sizeof(cp), &cp);

	}



	if (!test_and_set_bit(HCI_CONN_MODE_CHANGE_PEND, &conn->pend)) {

		struct hci_cp_sniff_mode cp;

		cp.handle       = cpu_to_le16(conn->handle);

		cp.max_interval = cpu_to_le16(hdev->sniff_max_interval);

		cp.min_interval = cpu_to_le16(hdev->sniff_min_interval);

		cp.attempt      = cpu_to_le16(4);

		cp.timeout      = cpu_to_le16(1);

		hci_send_cmd(hdev, HCI_OP_SNIFF_MODE, sizeof(cp), &cp);

	}

}



static void hci_conn_idle(unsigned long arg)

{

	struct hci_conn *conn = (void *) arg;
@@ -767,42 +803,6 @@ void hci_conn_enter_active_mode(struct hci_conn *conn, __u8 force_active) 
			jiffies + msecs_to_jiffies(hdev->idle_timeout));

}



/* Enter sniff mode */

void hci_conn_enter_sniff_mode(struct hci_conn *conn)

{

	struct hci_dev *hdev = conn->hdev;



	BT_DBG("conn %p mode %d", conn, conn->mode);



	if (test_bit(HCI_RAW, &hdev->flags))

		return;



	if (!lmp_sniff_capable(hdev) || !lmp_sniff_capable(conn))

		return;



	if (conn->mode != HCI_CM_ACTIVE || !(conn->link_policy & HCI_LP_SNIFF))

		return;



	if (lmp_sniffsubr_capable(hdev) && lmp_sniffsubr_capable(conn)) {

		struct hci_cp_sniff_subrate cp;

		cp.handle             = cpu_to_le16(conn->handle);

		cp.max_latency        = cpu_to_le16(0);

		cp.min_remote_timeout = cpu_to_le16(0);

		cp.min_local_timeout  = cpu_to_le16(0);

		hci_send_cmd(hdev, HCI_OP_SNIFF_SUBRATE, sizeof(cp), &cp);

	}



	if (!test_and_set_bit(HCI_CONN_MODE_CHANGE_PEND, &conn->pend)) {

		struct hci_cp_sniff_mode cp;

		cp.handle       = cpu_to_le16(conn->handle);

		cp.max_interval = cpu_to_le16(hdev->sniff_max_interval);

		cp.min_interval = cpu_to_le16(hdev->sniff_min_interval);

		cp.attempt      = cpu_to_le16(4);

		cp.timeout      = cpu_to_le16(1);

		hci_send_cmd(hdev, HCI_OP_SNIFF_MODE, sizeof(cp), &cp);

	}

}



/* Drop all connection on the device */

void hci_conn_hash_flush(struct hci_dev *hdev)

{