diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2014-07-10 10:51:27 +0300 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2014-07-10 10:02:35 +0200 |
| commit | e8b1202ce6ab67341660812e7d66db4c3e2a5649 (patch) | |
| tree | 39d634b24ad66013fff9124bba658c808475b9ec /net/bluetooth/mgmt.c | |
| parent | c072d546c20390fea0e5332d00fd1b67366ca013 (diff) | |
| download | linux-stable-e8b1202ce6ab67341660812e7d66db4c3e2a5649.tar.gz linux-stable-e8b1202ce6ab67341660812e7d66db4c3e2a5649.tar.bz2 linux-stable-e8b1202ce6ab67341660812e7d66db4c3e2a5649.zip | |
Bluetooth: Fix advertising parameter update when toggling connectable
When we change the connectable state and have advertising enabled we
should update the advertising parameters no matter what. The code was
incorrectly only updating them if advertising was not already active.
This patch fixes the issue.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/mgmt.c')
| -rw-r--r-- | net/bluetooth/mgmt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 91b1f92c681e..38f05386bc0c 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -1882,8 +1882,8 @@ static int set_connectable(struct sock *sk, struct hci_dev *hdev, void *data, if (cp->val || test_bit(HCI_FAST_CONNECTABLE, &hdev->dev_flags)) write_fast_connectable(&req, false); - if (test_bit(HCI_ADVERTISING, &hdev->dev_flags) && - !test_bit(HCI_LE_ADV, &hdev->dev_flags)) + /* Update the advertising parameters if necessary */ + if (test_bit(HCI_ADVERTISING, &hdev->dev_flags)) enable_advertising(&req); err = hci_req_run(&req, set_connectable_complete); |