From: Andre Guedes <andre.guedes@openbossa.org>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH 5/8] Bluetooth: Move bdaddr_to_le to hci_core
Date: Tue, 24 Apr 2012 21:02:53 -0300 [thread overview]
Message-ID: <1335312176-21306-6-git-send-email-andre.guedes@openbossa.org> (raw)
In-Reply-To: <1335312176-21306-1-git-send-email-andre.guedes@openbossa.org>
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: Andre Guedes <andre.guedes@openbossa.org>
---
include/net/bluetooth/hci_core.h | 2 ++
net/bluetooth/hci_core.c | 12 ++++++++++++
net/bluetooth/mgmt.c | 12 ------------
3 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 6777432..7e7fe3f 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -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 */
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 0d9ed01..ce8535f 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -2947,3 +2947,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;
+ }
+}
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 6d80cb3..2c77473 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -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)
{
--
1.7.10
next prev parent reply other threads:[~2012-04-25 0:02 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-25 0:02 [PATCH 0/8] LE Connection Andre Guedes
2012-04-25 0:02 ` [PATCH 1/8] Bluetooth: Move address type macros to bluetooth.h Andre Guedes
2012-04-25 0:02 ` [PATCH 2/8] Bluetooth: Rename link_to_mgmt to link_to_bdaddr Andre Guedes
2012-04-25 0:02 ` [PATCH 3/8] Bluetooth: Rename mgmt_to_le to bdaddr_to_le Andre Guedes
2012-04-25 0:02 ` [PATCH 4/8] Bluetooth: Add address type to struct sockaddr_l2 Andre Guedes
2012-04-25 6:45 ` Marcel Holtmann
2012-04-25 0:02 ` Andre Guedes [this message]
2012-04-25 0:02 ` [PATCH 6/8] Bluetooth: Add dst_type parameter to hci_connect Andre Guedes
2012-04-25 0:02 ` [PATCH 7/8] Bluetooth: Use address type info from user-space Andre Guedes
2012-04-25 0:02 ` [PATCH 8/8] Bluetooth: Remove advertising cache Andre Guedes
2012-04-25 6:47 ` [PATCH 0/8] LE Connection Marcel Holtmann
2012-04-25 9:18 ` Johan Hedberg
2012-04-25 9:25 ` Marcel Holtmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1335312176-21306-6-git-send-email-andre.guedes@openbossa.org \
--to=andre.guedes@openbossa.org \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox