From: Florian Grandel <fgrandel@gmail.com>
Date: Thu, 18 Jun 2015 01:16:50 +0000 (+0200)
Subject: Bluetooth: mgmt: multi-adv for trigger_le_scan()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9d5fc2f23afc842cbb3ee85600cd92bf5120a71d;p=linux-beck.git

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>
---

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);
 	}