diff options
| author | David S. Miller <davem@davemloft.net> | 2015-01-18 08:25:30 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-18 08:25:30 +0300 |
| commit | e445dd5f6745922bf4d8c18e1f071b28c5a061bb (patch) | |
| tree | dfb23a2d6375807fb05d07951f35a4dd29e4631b /net/bluetooth/hci_request.c | |
| parent | 3aeb66176ffa8fefd7a9f7d37bda1d8adcf469a1 (diff) | |
| parent | 0026b6551b51a9520b912f41b8d447b89a825f5a (diff) | |
| download | linux-e445dd5f6745922bf4d8c18e1f071b28c5a061bb.tar.xz | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2015-01-16
Here are some more bluetooth & ieee802154 patches intended for 3.20:
- Refactoring & cleanups of ieee802154 & 6lowpan code
- Various fixes to the btmrvl driver
- Fixes for Bluetooth Low Energy Privacy feature handling
- Added build-time sanity checks for sockaddr sizes
- Fixes for Security Manager registration on LE-only controllers
- Refactoring of broken inquiry mode handling to a generic quirk
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bluetooth/hci_request.c')
| -rw-r--r-- | net/bluetooth/hci_request.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c index 324c6418b17c..b59f92c6df0c 100644 --- 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: " |