aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/mgmt.c
diff options
context:
space:
mode:
authorFlorian Grandel <fgrandel@gmail.com>2015-06-18 03:16:50 +0200
committerMarcel Holtmann <marcel@holtmann.org>2015-06-18 18:11:53 +0200
commit9d5fc2f23afc842cbb3ee85600cd92bf5120a71d (patch)
treea668be4006550f99522eac9f32f0ae1d112882aa /net/bluetooth/mgmt.c
parentBluetooth: mgmt: program multi-adv on power on (diff)
downloadlinux-dev-9d5fc2f23afc842cbb3ee85600cd92bf5120a71d.tar.xz
linux-dev-9d5fc2f23afc842cbb3ee85600cd92bf5120a71d.zip
Bluetooth: mgmt: multi-adv for trigger_le_scan()
This patch ensures that instance advertising is correctly canceled before starting a le scan. Signed-off-by: Florian Grandel <fgrandel@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/mgmt.c')
-rw-r--r--net/bluetooth/mgmt.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 57e27b7ae3db..f44c6e3be938 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -4215,6 +4215,7 @@ static bool trigger_le_scan(struct hci_request *req, u16 interval, u8 *status)
return false;
}
+ cancel_adv_timeout(hdev);
disable_advertising(req);
}