Commit d4905f24 authored by Andre Guedes's avatar Andre Guedes Committed by Marcel Holtmann
Browse files

Bluetooth: Connection parameters check helper 



This patch renames l2cap_check_conn_param() to hci_check_conn_params()
and moves it to hci_core.h so it can reused in others files. This helper
will be reused in the next patch.

Signed-off-by: default avatarAndre Guedes <andre.guedes@openbossa.org>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent c20c02d5

include/net/bluetooth/hci_core.h

+21 −0
Original line number Diff line number Diff line
@@ -1181,6 +1181,27 @@ static inline struct smp_irk *hci_get_irk(struct hci_dev *hdev, 
	return hci_find_irk_by_rpa(hdev, bdaddr);

}



static inline int hci_check_conn_params(u16 min, u16 max, u16 latency,

					u16 to_multiplier)

{

	u16 max_latency;



	if (min > max || min < 6 || max > 3200)

		return -EINVAL;



	if (to_multiplier < 10 || to_multiplier > 3200)

		return -EINVAL;



	if (max >= to_multiplier * 8)

		return -EINVAL;



	max_latency = (to_multiplier * 8 / max) - 1;

	if (latency > 499 || latency > max_latency)

		return -EINVAL;



	return 0;

}



int hci_register_cb(struct hci_cb *hcb);

int hci_unregister_cb(struct hci_cb *hcb);

net/bluetooth/l2cap_core.c

+1 −22
Original line number Diff line number Diff line
@@ -5213,27 +5213,6 @@ static inline int l2cap_move_channel_confirm_rsp(struct l2cap_conn *conn, 
	return 0;

}



static inline int l2cap_check_conn_param(u16 min, u16 max, u16 latency,

					 u16 to_multiplier)

{

	u16 max_latency;



	if (min > max || min < 6 || max > 3200)

		return -EINVAL;



	if (to_multiplier < 10 || to_multiplier > 3200)

		return -EINVAL;



	if (max >= to_multiplier * 8)

		return -EINVAL;



	max_latency = (to_multiplier * 8 / max) - 1;

	if (latency > 499 || latency > max_latency)

		return -EINVAL;



	return 0;

}



static inline int l2cap_conn_param_update_req(struct l2cap_conn *conn,

					      struct l2cap_cmd_hdr *cmd,

					      u16 cmd_len, u8 *data)
@@ -5261,7 +5240,7 @@ static inline int l2cap_conn_param_update_req(struct l2cap_conn *conn, 


	memset(&rsp, 0, sizeof(rsp));



	err = l2cap_check_conn_param(min, max, latency, to_multiplier);

	err = hci_check_conn_params(min, max, latency, to_multiplier);

	if (err)

		rsp.result = cpu_to_le16(L2CAP_CONN_PARAM_REJECTED);

	else