Commit 7d6ca693 authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: Make hci_le_conn_update return the store hint 



The caller of hci_le_conn_update is directly interested in knowing what
the best value is for the store_hint parameter of the corresponding
mgmt event. Since hci_le_conn_update knows whether there were stored
parameters that were updated or not we can have it return an initial
store_hint value to the caller.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 348d50b8

include/net/bluetooth/hci_core.h

+2 −2
Original line number Diff line number Diff line
@@ -1368,8 +1368,8 @@ struct hci_sec_filter { 
#define hci_req_lock(d)		mutex_lock(&d->req_lock)

#define hci_req_unlock(d)	mutex_unlock(&d->req_lock)



void hci_le_conn_update(struct hci_conn *conn, u16 min, u16 max,

					u16 latency, u16 to_multiplier);

u8 hci_le_conn_update(struct hci_conn *conn, u16 min, u16 max, u16 latency,

		      u16 to_multiplier);

void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __le64 rand,

							__u8 ltk[16]);

net/bluetooth/hci_conn.c

+7 −2
Original line number Diff line number Diff line
@@ -213,8 +213,8 @@ bool hci_setup_sync(struct hci_conn *conn, __u16 handle) 
	return true;

}



void hci_le_conn_update(struct hci_conn *conn, u16 min, u16 max,

			u16 latency, u16 to_multiplier)

u8 hci_le_conn_update(struct hci_conn *conn, u16 min, u16 max, u16 latency,

		      u16 to_multiplier)

{

	struct hci_dev *hdev = conn->hdev;

	struct hci_conn_params *params;
@@ -242,6 +242,11 @@ void hci_le_conn_update(struct hci_conn *conn, u16 min, u16 max, 
	cp.max_ce_len		= cpu_to_le16(0x0000);



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



	if (params)

		return 0x01;



	return 0x00;

}



void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __le64 rand,