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

Commit 4748fed2 authored by Johan Hedberg's avatar Johan Hedberg Committed by Gustavo Padovan
Browse files

Bluetooth: Remove old_key_type from mgmt_ev_new_key 



User space shouldn't have any need for the old key type so remove it
from the corresponding Management interface event.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@nokia.com>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 655fe6ec

include/net/bluetooth/hci_core.h

+1 −1
Original line number Diff line number Diff line
@@ -775,7 +775,7 @@ int mgmt_index_removed(u16 index); 
int mgmt_powered(u16 index, u8 powered);

int mgmt_discoverable(u16 index, u8 discoverable);

int mgmt_connectable(u16 index, u8 connectable);

int mgmt_new_key(u16 index, struct link_key *key, u8 old_key_type);

int mgmt_new_key(u16 index, struct link_key *key);

int mgmt_connected(u16 index, bdaddr_t *bdaddr);

int mgmt_disconnected(u16 index, bdaddr_t *bdaddr);

int mgmt_disconnect_failed(u16 index);

include/net/bluetooth/mgmt.h

+0 −1
Original line number Diff line number Diff line
@@ -231,7 +231,6 @@ struct mgmt_ev_controller_error { 
#define MGMT_EV_NEW_KEY			0x000A

struct mgmt_ev_new_key {

	struct mgmt_key_info key;

	__u8 old_key_type;

} __packed;



#define MGMT_EV_CONNECTED		0x000B

net/bluetooth/hci_core.c

+5 −4
Original line number Diff line number Diff line
@@ -1097,14 +1097,15 @@ int hci_add_link_key(struct hci_dev *hdev, struct hci_conn *conn, int new_key, 


	bacpy(&key->bdaddr, bdaddr);

	memcpy(key->val, val, 16);

	key->type = type;

	key->pin_len = pin_len;



	if (new_key)

		mgmt_new_key(hdev->id, key, old_key_type);



	if (type == HCI_LK_CHANGED_COMBINATION)

		key->type = old_key_type;

	else

		key->type = type;



	if (new_key)

		mgmt_new_key(hdev->id, key);



	return 0;

}

net/bluetooth/mgmt.c

+1 −2
Original line number Diff line number Diff line
@@ -1858,7 +1858,7 @@ int mgmt_connectable(u16 index, u8 connectable) 
	return ret;

}



int mgmt_new_key(u16 index, struct link_key *key, u8 old_key_type)

int mgmt_new_key(u16 index, struct link_key *key)

{

	struct mgmt_ev_new_key ev;
@@ -1868,7 +1868,6 @@ int mgmt_new_key(u16 index, struct link_key *key, u8 old_key_type) 
	ev.key.type = key->type;

	memcpy(ev.key.val, key->val, 16);

	ev.key.pin_len = key->pin_len;

	ev.old_key_type = old_key_type;



	return mgmt_event(MGMT_EV_NEW_KEY, index, &ev, sizeof(ev), NULL);

}