]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Bluetooth: Fix missing return statement in process_adv_report
authorJohan Hedberg <johan.hedberg@intel.com>
Fri, 4 Jul 2014 09:37:16 +0000 (12:37 +0300)
committerMarcel Holtmann <marcel@holtmann.org>
Fri, 4 Jul 2014 09:58:08 +0000 (11:58 +0200)
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>
net/bluetooth/hci_event.c

index 20317e516e740895be0355d319ff3458126d8389..e0407e674061e6305220fe6bada56b67148c8ac0 100644 (file)
@@ -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