diff options
author | Andre Guedes <andre.guedes@openbossa.org> | 2012-04-24 20:02:53 -0400 |
---|---|---|
committer | Gustavo Padovan <gustavo@padovan.org> | 2012-05-09 00:40:44 -0400 |
commit | 31f7956c6648fbae9c9550e91d1c348d28276309 (patch) | |
tree | 1493deb456bfb82bf9ff3ad2380bdd2dcf60baae /net | |
parent | 378b5b7e8426f65a0ecb81b83a050c6a0c119e1f (diff) |
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: Andre Guedes <andre.guedes@openbossa.org>
Acked-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
-rw-r--r-- | net/bluetooth/hci_core.c | 12 | ||||
-rw-r--r-- | net/bluetooth/mgmt.c | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index aa45ea496f87..7bbd5c5767b9 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c | |||
@@ -2946,3 +2946,15 @@ int hci_cancel_inquiry(struct hci_dev *hdev) | |||
2946 | 2946 | ||
2947 | return hci_send_cmd(hdev, HCI_OP_INQUIRY_CANCEL, 0, NULL); | 2947 | return hci_send_cmd(hdev, HCI_OP_INQUIRY_CANCEL, 0, NULL); |
2948 | } | 2948 | } |
2949 | |||
2950 | u8 bdaddr_to_le(u8 bdaddr_type) | ||
2951 | { | ||
2952 | switch (bdaddr_type) { | ||
2953 | case BDADDR_LE_PUBLIC: | ||
2954 | return ADDR_LE_DEV_PUBLIC; | ||
2955 | |||
2956 | default: | ||
2957 | /* Fallback to LE Random address type */ | ||
2958 | return ADDR_LE_DEV_RANDOM; | ||
2959 | } | ||
2960 | } | ||
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 605a35b284fe..4e26c2585817 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) | |||
1644 | } | 1644 | } |
1645 | } | 1645 | } |
1646 | 1646 | ||
1647 | static u8 bdaddr_to_le(u8 bdaddr_type) | ||
1648 | { | ||
1649 | switch (bdaddr_type) { | ||
1650 | case BDADDR_LE_PUBLIC: | ||
1651 | return ADDR_LE_DEV_PUBLIC; | ||
1652 | |||
1653 | default: | ||
1654 | /* Fallback to LE Random address type */ | ||
1655 | return ADDR_LE_DEV_RANDOM; | ||
1656 | } | ||
1657 | } | ||
1658 | |||
1659 | static int get_connections(struct sock *sk, struct hci_dev *hdev, void *data, | 1647 | static int get_connections(struct sock *sk, struct hci_dev *hdev, void *data, |
1660 | u16 data_len) | 1648 | u16 data_len) |
1661 | { | 1649 | { |