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

Commit 31f7956c authored by Andre Guedes's avatar Andre Guedes Committed by Gustavo Padovan
Browse files

Bluetooth: Move bdaddr_to_le to hci_core 



This patch moves the helper function bdaddr_to_le to hci_core, so it
can be used in mgmt.c and hci_conn.c.

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 378b5b7e

include/net/bluetooth/hci_core.h

+2 −0
Original line number Diff line number Diff line
@@ -1073,4 +1073,6 @@ int hci_le_scan(struct hci_dev *hdev, u8 type, u16 interval, u16 window, 
		int timeout);

int hci_cancel_le_scan(struct hci_dev *hdev);



u8 bdaddr_to_le(u8 bdaddr_type);



#endif /* __HCI_CORE_H */

net/bluetooth/hci_core.c

+12 −0
Original line number Diff line number Diff line
@@ -2946,3 +2946,15 @@ int hci_cancel_inquiry(struct hci_dev *hdev) 


	return hci_send_cmd(hdev, HCI_OP_INQUIRY_CANCEL, 0, NULL);

}



u8 bdaddr_to_le(u8 bdaddr_type)

{

	switch (bdaddr_type) {

	case BDADDR_LE_PUBLIC:

		return ADDR_LE_DEV_PUBLIC;



	default:

		/* Fallback to LE Random address type */

		return ADDR_LE_DEV_RANDOM;

	}

}

net/bluetooth/mgmt.c

+0 −12
Original line number Diff line number Diff line
@@ -1644,18 +1644,6 @@ static u8 link_to_bdaddr(u8 link_type, u8 addr_type) 
	}

}



static u8 bdaddr_to_le(u8 bdaddr_type)

{

	switch (bdaddr_type) {

	case BDADDR_LE_PUBLIC:

		return ADDR_LE_DEV_PUBLIC;



	default:

		/* Fallback to LE Random address type */

		return ADDR_LE_DEV_RANDOM;

	}

}



static int get_connections(struct sock *sk, struct hci_dev *hdev, void *data,

			   u16 data_len)

{