projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit
[firefly-linux-kernel-4.4.55.git]
/
net
/
bluetooth
/
hci_request.c
diff --git
a/net/bluetooth/hci_request.c
b/net/bluetooth/hci_request.c
index 324c6418b17c7156c8d6cbf44ea78db6939ae431..b59f92c6df0cf7cfa1b4c770cb2e880079ae0c84 100644
(file)
--- a/
net/bluetooth/hci_request.c
+++ b/
net/bluetooth/hci_request.c
@@
-533,7
+533,8
@@
void __hci_update_background_scan(struct hci_request *req)
}
}
-static void update_background_scan_complete(struct hci_dev *hdev, u8 status)
+static void update_background_scan_complete(struct hci_dev *hdev, u8 status,
+ u16 opcode)
{
if (status)
BT_DBG("HCI request failed to update background scanning: "