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

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

Bluetooth: Make mgmt_new_link_key() return void 



The return value of mgmt_new_link_key() function is not used
and so just change it to return void.

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

include/net/bluetooth/hci_core.h

+2 −2
Original line number Diff line number Diff line
@@ -1103,7 +1103,7 @@ int mgmt_powered(struct hci_dev *hdev, u8 powered); 
void mgmt_discoverable(struct hci_dev *hdev, u8 discoverable);

void mgmt_connectable(struct hci_dev *hdev, u8 connectable);

void mgmt_write_scan_failed(struct hci_dev *hdev, u8 scan, u8 status);

int mgmt_new_link_key(struct hci_dev *hdev, struct link_key *key,

void mgmt_new_link_key(struct hci_dev *hdev, struct link_key *key,

		       bool persistent);

void mgmt_device_connected(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,

			   u8 addr_type, u32 flags, u8 *name, u8 name_len,

net/bluetooth/mgmt.c

+3 −3
Original line number Diff line number Diff line
@@ -4341,7 +4341,7 @@ void mgmt_write_scan_failed(struct hci_dev *hdev, u8 scan, u8 status) 
				     cmd_status_rsp, &mgmt_err);

}



int mgmt_new_link_key(struct hci_dev *hdev, struct link_key *key,

void mgmt_new_link_key(struct hci_dev *hdev, struct link_key *key,

		       bool persistent)

{

	struct mgmt_ev_new_link_key ev;
@@ -4355,7 +4355,7 @@ int mgmt_new_link_key(struct hci_dev *hdev, struct link_key *key, 
	memcpy(ev.key.val, key->val, HCI_LINK_KEY_SIZE);

	ev.key.pin_len = key->pin_len;



	return mgmt_event(MGMT_EV_NEW_LINK_KEY, hdev, &ev, sizeof(ev), NULL);

	mgmt_event(MGMT_EV_NEW_LINK_KEY, hdev, &ev, sizeof(ev), NULL);

}



int mgmt_new_ltk(struct hci_dev *hdev, struct smp_ltk *key, u8 persistent)