aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2013-10-16 03:16:50 -0400
committerJohan Hedberg <johan.hedberg@intel.com>2013-10-16 03:31:46 -0400
commit5947f4bc4253df3a18a540af096463530c5f8737 (patch)
treef620dbf2091a29a8584931360ffc7a2af0b75a5e /net/bluetooth
parent7a5f4990a4c6934a84b040337bdd7682637c2562 (diff)
Bluetooth: Rename update_ad into update_adv_data
Since there is update_scan_rsp_data, it is also better to use the clear name update_adv_data instead of update_ad. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/mgmt.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index cd285d6c1ebf..0bf823b5d90e 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -626,7 +626,7 @@ static u8 create_adv_data(struct hci_dev *hdev, u8 *ptr)
626 return ad_len; 626 return ad_len;
627} 627}
628 628
629static void update_ad(struct hci_request *req) 629static void update_adv_data(struct hci_request *req)
630{ 630{
631 struct hci_dev *hdev = req->hdev; 631 struct hci_dev *hdev = req->hdev;
632 struct hci_cp_le_set_adv_data cp; 632 struct hci_cp_le_set_adv_data cp;
@@ -1746,7 +1746,7 @@ static void le_enable_complete(struct hci_dev *hdev, u8 status)
1746 hci_dev_lock(hdev); 1746 hci_dev_lock(hdev);
1747 1747
1748 hci_req_init(&req, hdev); 1748 hci_req_init(&req, hdev);
1749 update_ad(&req); 1749 update_adv_data(&req);
1750 update_scan_rsp_data(&req); 1750 update_scan_rsp_data(&req);
1751 hci_req_run(&req, NULL); 1751 hci_req_run(&req, NULL);
1752 1752
@@ -3924,7 +3924,7 @@ static int set_bredr(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)
3924 goto unlock; 3924 goto unlock;
3925 } 3925 }
3926 3926
3927 /* We need to flip the bit already here so that update_ad 3927 /* We need to flip the bit already here so that update_adv_data
3928 * generates the correct flags. 3928 * generates the correct flags.
3929 */ 3929 */
3930 set_bit(HCI_BREDR_ENABLED, &hdev->dev_flags); 3930 set_bit(HCI_BREDR_ENABLED, &hdev->dev_flags);
@@ -3937,7 +3937,7 @@ static int set_bredr(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)
3937 /* Since only the advertising data flags will change, there 3937 /* Since only the advertising data flags will change, there
3938 * is no need to update the scan response data. 3938 * is no need to update the scan response data.
3939 */ 3939 */
3940 update_ad(&req); 3940 update_adv_data(&req);
3941 3941
3942 err = hci_req_run(&req, set_bredr_complete); 3942 err = hci_req_run(&req, set_bredr_complete);
3943 if (err < 0) 3943 if (err < 0)
@@ -4251,7 +4251,7 @@ static int powered_update_hci(struct hci_dev *hdev)
4251 * where BR/EDR was toggled during the AUTO_OFF phase. 4251 * where BR/EDR was toggled during the AUTO_OFF phase.
4252 */ 4252 */
4253 if (test_bit(HCI_LE_ENABLED, &hdev->dev_flags)) { 4253 if (test_bit(HCI_LE_ENABLED, &hdev->dev_flags)) {
4254 update_ad(&req); 4254 update_adv_data(&req);
4255 update_scan_rsp_data(&req); 4255 update_scan_rsp_data(&req);
4256 } 4256 }
4257 4257