summaryrefslogtreecommitdiff
path: root/net/bluetooth
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * Bluetooth: Simplify logic when checking SMP_FLAG_TK_VALIDJohan Hedberg2014-03-191-4/+2
| | * Bluetooth: Fix MITM flag when initiating SMP pairingJohan Hedberg2014-03-181-0/+6
| | * Bluetooth: Fix smp_e byte order to be consistent with SMP specificationJohan Hedberg2014-03-181-55/+46
| | * Bluetooth: Fix const declaration for swap function src parameterJohan Hedberg2014-03-181-2/+2
| | * Bluetooth: Fix updating SMP remote key distribution informationJohan Hedberg2014-03-141-0/+5
| | * Bluetooth: make sure 6LOWPAN_IPHC is built-in if neededArnd Bergmann2014-03-131-1/+1
| | * Bluetooth: Convert uses of __constant_<foo> to <foo>Joe Perches2014-03-1211-96/+96
| | * Bluetooth: Enable duplicates filter in background scanAndre Guedes2014-03-111-5/+7
| | * Bluetooth: Fix aborting eSCO connection in case of error 0x20Andrew Earl2014-03-111-0/+1
| | * Bluetooth: make bluetooth 6lowpan as an optionAlexander Aring2014-03-113-2/+30
| | * Bluetooth: Make LTK and CSRK only persisent when bondingMarcel Holtmann2014-03-102-8/+17
| | * Bluetooth: Add support for handling signature resolving keysMarcel Holtmann2014-03-093-5/+94
| | * Bluetooth: Fix skb allocation check for A2MPGustavo Padovan2014-03-071-1/+7
| | * Bluetooth: Fix expected key count debug logsJohan Hedberg2014-03-071-3/+3
| | * Bluetooth: Fix removing Long Term KeyClaudio Takahasi2014-03-051-1/+7
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2014-03-1315-905/+3419
| |\ \ | | |/
| | * Bluetooth: Remove unnecessary stop_scan_complete functionJohan Hedberg2014-02-282-43/+15
| | * Bluetooth: Fix trying to disable scanning twiceJohan Hedberg2014-02-282-1/+5
| | * Bluetooth: Delay LTK encryption to let remote receive all keysJohan Hedberg2014-02-282-3/+22
| | * Bluetooth: Re-encrypt link after receiving an LTKJohan Hedberg2014-02-282-6/+29
| | * Bluetooth: Add timeout for LE connection attemptsJohan Hedberg2014-02-282-0/+25
| | * Bluetooth: Use hdev->init/resp_addr values for smp_c1 functionJohan Hedberg2014-02-281-16/+6
| | * Bluetooth: Track LE initiator and responder address informationJohan Hedberg2014-02-281-0/+78
| | * Bluetooth: Fix updating connection state to BT_CONNECT too earlyJohan Hedberg2014-02-281-1/+2
| | * Bluetooth: Add protections for updating local random addressJohan Hedberg2014-02-282-2/+32
| | * Bluetooth: Fix clearing SMP keys if pairing failsJohan Hedberg2014-02-281-0/+18
| | * Bluetooth: Use __le64 type for LE random numbersMarcel Holtmann2014-02-286-25/+22
| | * Bluetooth: Add timer to force power offJohan Hedberg2014-02-271-3/+13
| | * Bluetooth: Fix disconnecting connections in non-connected statesJohan Hedberg2014-02-271-4/+40
| | * Bluetooth: Track LE white list modification via HCI commandsMarcel Holtmann2014-02-281-0/+55
View Lorry Controller Status