openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bluetooth: Use the correct flag to decide to disable advertising 

When deciding to call disable_advertising() we're interested in the real
state instead of the mgmt setting. Use therefore HCI_LE_ADV instead of
the HCI_ADVERTISING flag.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Johan Hedberg 2014-07-08 15:07:51 +03:00 committed by Marcel Holtmann
parent 0ec5ae8438
commit 73e082f80d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/bluetooth/mgmt.c
View File

@ -1301,7 +1301,7 @@ static int clean_up_hci_state(struct hci_dev *hdev)
hci_req_add(&req, HCI_OP_WRITE_SCAN_ENABLE, 1, &scan); hci_req_add(&req, HCI_OP_WRITE_SCAN_ENABLE, 1, &scan);
} }
if (test_bit(HCI_ADVERTISING, &hdev->dev_flags)) if (test_bit(HCI_LE_ADV, &hdev->dev_flags))
disable_advertising(&req); disable_advertising(&req);
hci_stop_discovery(&req); hci_stop_discovery(&req);
@ -2230,7 +2230,7 @@ static int set_le(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)
hci_cp.le = val; hci_cp.le = val;
hci_cp.simul = lmp_le_br_capable(hdev); hci_cp.simul = lmp_le_br_capable(hdev);
} else { } else {
if (test_bit(HCI_ADVERTISING, &hdev->dev_flags)) if (test_bit(HCI_LE_ADV, &hdev->dev_flags))
disable_advertising(&req); disable_advertising(&req);
} }