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

Commit 57c1477c authored by Andre Guedes's avatar Andre Guedes Committed by Gustavo Padovan
Browse files

Bluetooth: Rename link_to_mgmt to link_to_bdaddr 



Since address type macros are not only related to Management
Interface anymore, it makes sense to rename the helper function
link_to_mgmt to link_to_bdaddr.

Signed-off-by: default avatarAndre Guedes <andre.guedes@openbossa.org>
Acked-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 591f47f3

net/bluetooth/mgmt.c

+14 −14
Original line number Original line Diff line number Diff line
@@ -1625,7 +1625,7 @@ static int disconnect(struct sock *sk, struct hci_dev *hdev, void *data, 
	return err;

	return err;

}

}





static u8 link_to_mgmt(u8 link_type, u8 addr_type)

static u8 link_to_bdaddr(u8 link_type, u8 addr_type)

{

{

	switch (link_type) {

	switch (link_type) {

	case LE_LINK:

	case LE_LINK:
@@ -1693,7 +1693,7 @@ static int get_connections(struct sock *sk, struct hci_dev *hdev, void *data, 
		if (!test_bit(HCI_CONN_MGMT_CONNECTED, &c->flags))

		if (!test_bit(HCI_CONN_MGMT_CONNECTED, &c->flags))

			continue;

			continue;

		bacpy(&rp->addr[i].bdaddr, &c->dst);

		bacpy(&rp->addr[i].bdaddr, &c->dst);

		rp->addr[i].type = link_to_mgmt(c->type, c->dst_type);

		rp->addr[i].type = link_to_bdaddr(c->type, c->dst_type);

		if (c->type == SCO_LINK || c->type == ESCO_LINK)

		if (c->type == SCO_LINK || c->type == ESCO_LINK)

			continue;

			continue;

		i++;

		i++;
@@ -1860,7 +1860,7 @@ static void pairing_complete(struct pending_cmd *cmd, u8 status) 
	struct hci_conn *conn = cmd->user_data;

	struct hci_conn *conn = cmd->user_data;





	bacpy(&rp.addr.bdaddr, &conn->dst);

	bacpy(&rp.addr.bdaddr, &conn->dst);

	rp.addr.type = link_to_mgmt(conn->type, conn->dst_type);

	rp.addr.type = link_to_bdaddr(conn->type, conn->dst_type);





	cmd_complete(cmd->sk, cmd->index, MGMT_OP_PAIR_DEVICE, status,

	cmd_complete(cmd->sk, cmd->index, MGMT_OP_PAIR_DEVICE, status,

		     &rp, sizeof(rp));

		     &rp, sizeof(rp));
@@ -2983,7 +2983,7 @@ int mgmt_new_ltk(struct hci_dev *hdev, struct smp_ltk *key, u8 persistent) 




	ev.store_hint = persistent;

	ev.store_hint = persistent;

	bacpy(&ev.key.addr.bdaddr, &key->bdaddr);

	bacpy(&ev.key.addr.bdaddr, &key->bdaddr);

	ev.key.addr.type = link_to_mgmt(LE_LINK, key->bdaddr_type);

	ev.key.addr.type = link_to_bdaddr(LE_LINK, key->bdaddr_type);

	ev.key.authenticated = key->authenticated;

	ev.key.authenticated = key->authenticated;

	ev.key.enc_size = key->enc_size;

	ev.key.enc_size = key->enc_size;

	ev.key.ediv = key->ediv;

	ev.key.ediv = key->ediv;
@@ -3007,7 +3007,7 @@ int mgmt_device_connected(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, 
	u16 eir_len = 0;

	u16 eir_len = 0;





	bacpy(&ev->addr.bdaddr, bdaddr);

	bacpy(&ev->addr.bdaddr, bdaddr);

	ev->addr.type = link_to_mgmt(link_type, addr_type);

	ev->addr.type = link_to_bdaddr(link_type, addr_type);





	ev->flags = __cpu_to_le32(flags);

	ev->flags = __cpu_to_le32(flags);
@@ -3070,7 +3070,7 @@ int mgmt_device_disconnected(struct hci_dev *hdev, bdaddr_t *bdaddr, 
	mgmt_pending_foreach(MGMT_OP_DISCONNECT, hdev, disconnect_rsp, &sk);

	mgmt_pending_foreach(MGMT_OP_DISCONNECT, hdev, disconnect_rsp, &sk);





	bacpy(&ev.bdaddr, bdaddr);

	bacpy(&ev.bdaddr, bdaddr);

	ev.type = link_to_mgmt(link_type, addr_type);

	ev.type = link_to_bdaddr(link_type, addr_type);





	err = mgmt_event(MGMT_EV_DEVICE_DISCONNECTED, hdev, &ev, sizeof(ev),

	err = mgmt_event(MGMT_EV_DEVICE_DISCONNECTED, hdev, &ev, sizeof(ev),

			 sk);

			 sk);
@@ -3096,7 +3096,7 @@ int mgmt_disconnect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, 
		return -ENOENT;

		return -ENOENT;





	bacpy(&rp.addr.bdaddr, bdaddr);

	bacpy(&rp.addr.bdaddr, bdaddr);

	rp.addr.type = link_to_mgmt(link_type, addr_type);

	rp.addr.type = link_to_bdaddr(link_type, addr_type);





	err = cmd_complete(cmd->sk, cmd->index, MGMT_OP_DISCONNECT,

	err = cmd_complete(cmd->sk, cmd->index, MGMT_OP_DISCONNECT,

			   mgmt_status(status), &rp, sizeof(rp));

			   mgmt_status(status), &rp, sizeof(rp));
@@ -3114,7 +3114,7 @@ int mgmt_connect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, 
	struct mgmt_ev_connect_failed ev;

	struct mgmt_ev_connect_failed ev;





	bacpy(&ev.addr.bdaddr, bdaddr);

	bacpy(&ev.addr.bdaddr, bdaddr);

	ev.addr.type = link_to_mgmt(link_type, addr_type);

	ev.addr.type = link_to_bdaddr(link_type, addr_type);

	ev.status = mgmt_status(status);

	ev.status = mgmt_status(status);





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

	return mgmt_event(MGMT_EV_CONNECT_FAILED, hdev, &ev, sizeof(ev), NULL);
@@ -3185,7 +3185,7 @@ int mgmt_user_confirm_request(struct hci_dev *hdev, bdaddr_t *bdaddr, 
	BT_DBG("%s", hdev->name);

	BT_DBG("%s", hdev->name);





	bacpy(&ev.addr.bdaddr, bdaddr);

	bacpy(&ev.addr.bdaddr, bdaddr);

	ev.addr.type = link_to_mgmt(link_type, addr_type);

	ev.addr.type = link_to_bdaddr(link_type, addr_type);

	ev.confirm_hint = confirm_hint;

	ev.confirm_hint = confirm_hint;

	ev.value = value;

	ev.value = value;
@@ -3201,7 +3201,7 @@ int mgmt_user_passkey_request(struct hci_dev *hdev, bdaddr_t *bdaddr, 
	BT_DBG("%s", hdev->name);

	BT_DBG("%s", hdev->name);





	bacpy(&ev.addr.bdaddr, bdaddr);

	bacpy(&ev.addr.bdaddr, bdaddr);

	ev.addr.type = link_to_mgmt(link_type, addr_type);

	ev.addr.type = link_to_bdaddr(link_type, addr_type);





	return mgmt_event(MGMT_EV_USER_PASSKEY_REQUEST, hdev, &ev, sizeof(ev),

	return mgmt_event(MGMT_EV_USER_PASSKEY_REQUEST, hdev, &ev, sizeof(ev),

			  NULL);

			  NULL);
@@ -3220,7 +3220,7 @@ static int user_pairing_resp_complete(struct hci_dev *hdev, bdaddr_t *bdaddr, 
		return -ENOENT;

		return -ENOENT;





	bacpy(&rp.addr.bdaddr, bdaddr);

	bacpy(&rp.addr.bdaddr, bdaddr);

	rp.addr.type = link_to_mgmt(link_type, addr_type);

	rp.addr.type = link_to_bdaddr(link_type, addr_type);

	err = cmd_complete(cmd->sk, hdev->id, opcode, mgmt_status(status),

	err = cmd_complete(cmd->sk, hdev->id, opcode, mgmt_status(status),

			   &rp, sizeof(rp));

			   &rp, sizeof(rp));
@@ -3263,7 +3263,7 @@ int mgmt_auth_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, 
	struct mgmt_ev_auth_failed ev;

	struct mgmt_ev_auth_failed ev;





	bacpy(&ev.addr.bdaddr, bdaddr);

	bacpy(&ev.addr.bdaddr, bdaddr);

	ev.addr.type = link_to_mgmt(link_type, addr_type);

	ev.addr.type = link_to_bdaddr(link_type, addr_type);

	ev.status = mgmt_status(status);

	ev.status = mgmt_status(status);





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

	return mgmt_event(MGMT_EV_AUTH_FAILED, hdev, &ev, sizeof(ev), NULL);
@@ -3530,7 +3530,7 @@ int mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, 
	memset(buf, 0, sizeof(buf));

	memset(buf, 0, sizeof(buf));





	bacpy(&ev->addr.bdaddr, bdaddr);

	bacpy(&ev->addr.bdaddr, bdaddr);

	ev->addr.type = link_to_mgmt(link_type, addr_type);

	ev->addr.type = link_to_bdaddr(link_type, addr_type);

	ev->rssi = rssi;

	ev->rssi = rssi;

	if (cfm_name)

	if (cfm_name)

		ev->flags[0] |= MGMT_DEV_FOUND_CONFIRM_NAME;

		ev->flags[0] |= MGMT_DEV_FOUND_CONFIRM_NAME;
@@ -3563,7 +3563,7 @@ int mgmt_remote_name(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, 
	memset(buf, 0, sizeof(buf));

	memset(buf, 0, sizeof(buf));





	bacpy(&ev->addr.bdaddr, bdaddr);

	bacpy(&ev->addr.bdaddr, bdaddr);

	ev->addr.type = link_to_mgmt(link_type, addr_type);

	ev->addr.type = link_to_bdaddr(link_type, addr_type);

	ev->rssi = rssi;

	ev->rssi = rssi;





	eir_len = eir_append_data(ev->eir, 0, EIR_NAME_COMPLETE, name,

	eir_len = eir_append_data(ev->eir, 0, EIR_NAME_COMPLETE, name,