luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bluetooth: Introduce hci_dev_change_flag helper macro

Browse Source 
Instead of manually coding change_bit on hdev->dev_flags all the time,
use hci_dev_change_flag helper macro.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Marcel Holtmann 2015-03-13 02:11:03 -07:00 committed by Johan Hedberg
parent a358dc11d8
commit ce05d603af
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/bluetooth/hci_core.h
View File

@ -504,6 +504,7 @@ extern struct mutex hci_cb_list_lock;
#define hci_dev_set_flag(hdev, nr) set_bit((nr), &(hdev)->dev_flags) #define hci_dev_set_flag(hdev, nr) set_bit((nr), &(hdev)->dev_flags)
#define hci_dev_clear_flag(hdev, nr) clear_bit((nr), &(hdev)->dev_flags) #define hci_dev_clear_flag(hdev, nr) clear_bit((nr), &(hdev)->dev_flags)
#define hci_dev_change_flag(hdev, nr) change_bit((nr), &(hdev)->dev_flags)
#define hci_dev_test_flag(hdev, nr) test_bit((nr), &(hdev)->dev_flags) #define hci_dev_test_flag(hdev, nr) test_bit((nr), &(hdev)->dev_flags)
/* ----- HCI interface to upper protocols ----- */ /* ----- HCI interface to upper protocols ----- */

10
net/bluetooth/mgmt.c
View File

@ -1674,7 +1674,7 @@ static int set_discoverable(struct sock *sk, struct hci_dev *hdev, void *data,
* and so no need to check HCI_LIMITED_DISCOVERABLE. * and so no need to check HCI_LIMITED_DISCOVERABLE.
*/ */
if (!!cp->val != hci_dev_test_flag(hdev, HCI_DISCOVERABLE)) { if (!!cp->val != hci_dev_test_flag(hdev, HCI_DISCOVERABLE)) {
change_bit(HCI_DISCOVERABLE, &hdev->dev_flags); hci_dev_change_flag(hdev, HCI_DISCOVERABLE);
changed = true; changed = true;
} }
@ -2046,7 +2046,7 @@ static int set_link_security(struct sock *sk, struct hci_dev *hdev, void *data,
bool changed = false; bool changed = false;
if (!!cp->val != hci_dev_test_flag(hdev, HCI_LINK_SECURITY)) { if (!!cp->val != hci_dev_test_flag(hdev, HCI_LINK_SECURITY)) {
change_bit(HCI_LINK_SECURITY, &hdev->dev_flags); hci_dev_change_flag(hdev, HCI_LINK_SECURITY);
changed = true; changed = true;
} }
@ -2301,7 +2301,7 @@ static int set_le(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)
bool changed = false; bool changed = false;
if (val != hci_dev_test_flag(hdev, HCI_LE_ENABLED)) { if (val != hci_dev_test_flag(hdev, HCI_LE_ENABLED)) {
change_bit(HCI_LE_ENABLED, &hdev->dev_flags); hci_dev_change_flag(hdev, HCI_LE_ENABLED);
changed = true; changed = true;
} }
@ -4689,7 +4689,7 @@ static int set_fast_connectable(struct sock *sk, struct hci_dev *hdev,
} }
if (!hdev_is_powered(hdev)) { if (!hdev_is_powered(hdev)) {
change_bit(HCI_FAST_CONNECTABLE, &hdev->dev_flags); hci_dev_change_flag(hdev, HCI_FAST_CONNECTABLE);
err = send_settings_rsp(sk, MGMT_OP_SET_FAST_CONNECTABLE, err = send_settings_rsp(sk, MGMT_OP_SET_FAST_CONNECTABLE,
hdev); hdev);
new_settings(hdev, sk); new_settings(hdev, sk);
@ -4789,7 +4789,7 @@ static int set_bredr(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)
hci_dev_clear_flag(hdev, HCI_HS_ENABLED); hci_dev_clear_flag(hdev, HCI_HS_ENABLED);
} }
change_bit(HCI_BREDR_ENABLED, &hdev->dev_flags); hci_dev_change_flag(hdev, HCI_BREDR_ENABLED);
err = send_settings_rsp(sk, MGMT_OP_SET_BREDR, hdev); err = send_settings_rsp(sk, MGMT_OP_SET_BREDR, hdev);
if (err < 0) if (err < 0)