summaryrefslogtreecommitdiffstats
path: root/net/bluetooth
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2014-05-271-2/+2
|\
| * Bluetooth: Fix L2CAP LE debugfs entries permissionsSamuel Ortiz2014-05-141-2/+2
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2014-05-132-3/+12
|\ \ | |/
| * Bluetooth: Fix redundant encryption request for reauthenticationJohan Hedberg2014-04-251-3/+6
| * Bluetooth: Fix triggering BR/EDR L2CAP Connect too earlyJohan Hedberg2014-04-251-0/+6
* | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-04-306-105/+290
|\ \ | |/ |/|
| * Bluetooth: Return EOPNOTSUPP for HCISETRAW ioctl commandMarcel Holtmann2014-04-241-10/+1
| * Bluetooth: Request MITM Protection when initiatorMikel Astiz2014-04-111-2/+4
| * Bluetooth: Use MITM Protection when IO caps allow itTimo Mueller2014-04-111-7/+2
| * Bluetooth: Refactor code for outgoing dedicated bondingMikel Astiz2014-04-112-10/+9
| * Bluetooth: Refactor hci_get_auth_req()Mikel Astiz2014-04-111-15/+22
| * Bluetooth: Fix address in unmergeable device found eventsJohan Hedberg2014-03-291-3/+2
| * Bluetooth: Keep msec in DISCOV_LE_TIMEOUTLukasz Rymanowski2014-03-281-1/+1
| * Bluetooth: Add new debugfs parameterLukasz Rymanowski2014-03-282-1/+5
| * Bluetooth: Keep msec in DISCOV_INTERLEAVED_TIMEOUTLukasz Rymanowski2014-03-281-4/+9
| * Bluetooth: Remove unnecessary NULL check in hci_inquiry_cache_updateJohan Hedberg2014-03-271-1/+1
| * Bluetooth: Fix RSSI value in device found event from disabling scanJohan Hedberg2014-03-261-2/+3
| * Bluetooth: Store also RSSI for pending advertising reportsJohan Hedberg2014-03-261-5/+7
| * Bluetooth: Don't send device found events for duplicate reportsJohan Hedberg2014-03-261-7/+12
| * Bluetooth: Fix line splitting of mgmt_device_found parametersJohan Hedberg2014-03-261-2/+2
| * Bluetooth: Remove redundant NULL checkJohan Hedberg2014-03-261-2/+1
| * Bluetooth: Merge ADV_IND/ADV_SCAN_IND and SCAN_RSP togetherJohan Hedberg2014-03-261-2/+101
| * Bluetooth: Add directed advertising support through connect()Johan Hedberg2014-03-262-10/+86
| * Bluetooth: Add scan_rsp parameter to mgmt_device_found()Johan Hedberg2014-03-262-10/+16
| * Bluetooth: Don't send device found events during passive scanningJohan Hedberg2014-03-261-2/+6
| * Bluetooth: Add error mapping for Directed Advertising TimeoutJohan Hedberg2014-03-261-0/+1
| * Bluetooth: Fix LE responder/initiator address settingJohan Hedberg2014-03-261-12/+14
| * Bluetooth: Move local identity address setting to a central placeJohan Hedberg2014-03-262-16/+4
| * Bluetooth: Use memdup_user in le_auto_conn_write()Andre Guedes2014-03-261-8/+3
| * Bluetooth: Refactor advertising report processing into its own functionJohan Hedberg2014-03-261-8/+13
* | net: Fix use after free by removing length arg from sk_data_ready callbacks.David S. Miller2014-04-114-8/+8
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2014-04-0220-1065/+3785
|\ \
| * \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2014-03-316-77/+106
| |\ \ | | |/
| | * Bluetooth: Fix returning peer address in pending connect stateJohan Hedberg2014-03-262-2/+4
| | * Bluetooth: Remove unnecessary assignment in SMPJohan Hedberg2014-03-241-2/+0
| | * Bluetooth: Fix potential NULL pointer dereference in smp_conn_securityJohan Hedberg2014-03-241-1/+1
| | * Bluetooth: Remove LTK re-encryption procedureJohan Hedberg2014-03-242-49/+7
| | * Bluetooth: Don't try to confirm locally initiated SMP pairingJohan Hedberg2014-03-241-0/+5
| | * Bluetooth: Add SMP flag to track which side is the initiatorJohan Hedberg2014-03-242-0/+7
| | * Bluetooth: Fix SMP confirmation callback handlingJohan Hedberg2014-03-241-0/+4
| | * Bluetooth: Add missing cmd_status handler for LE_Start_EncryptionJohan Hedberg2014-03-241-0/+34
| | * Bluetooth: Fix potential NULL pointer dereference in SMPJohan Hedberg2014-03-241-1/+7
| | * Bluetooth: Track current configured LE scan type parameterMarcel Holtmann2014-03-211-0/+25
| | * Bluetooth: Fix address value for early disconnection eventsJohan Hedberg2014-03-202-21/+11
| | * Bluetooth: Fix passkey endianess in user_confirm and notify_passkeyJohan Hedberg2014-03-193-5/+5
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2014-03-2115-183/+360
| |\ \ | | |/
| | * Bluetooth: Enforce strict Secure Connections Only mode securityMarcel Holtmann2014-03-192-0/+23
| | * Bluetooth: Fix Pair Device response parameters for pairing failureJohan Hedberg2014-03-191-2/+14
| | * Bluetooth: Fix SMP user passkey notification mgmt eventJohan Hedberg2014-03-191-2/+3
| | * Bluetooth: Increase SMP re-encryption delay to 500msJohan Hedberg2014-03-191-1/+1
OpenPOWER on IntegriCloud