summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2014-07-04 09:37:16 (GMT)
committerMarcel Holtmann <marcel@holtmann.org>2014-07-04 09:58:08 (GMT)
commit97bf2e99934bdfd3f91914e6c935271b62567470 (patch)
tree35b39a6a1d91c0ca35121fff1541976b06e7bb97 /net
parent9fc3bfb681bdf59999f56072fff4632a5abea897 (diff)
downloadlinux-97bf2e99934bdfd3f91914e6c935271b62567470.tar.xz
Bluetooth: Fix missing return statement in process_adv_report
If we're doing passive scanning we shouldn't proceed with any of the code that deals with active scanning (pending reports, etc.). This patch fixes a missing return statement for the passive scanning section in the process_adv_report() function. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/hci_event.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 20317e5..e0407e6 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -4256,6 +4256,7 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr,
flags = 0;
mgmt_device_found(hdev, bdaddr, LE_LINK, bdaddr_type, NULL,
rssi, flags, data, len, NULL, 0);
+ return;
}
/* When receiving non-connectable or scannable undirected