summaryrefslogtreecommitdiffstats
path: root/net/bluetooth
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/davem/netDavid S. Miller2011-10-243-1/+11
|\
| * bluetooth: Properly clone LSM attributes to newly created child connectionsPaul Moore2011-10-183-1/+11
* | Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next...John W. Linville2011-10-118-192/+152
|\ \
| * | Bluetooth: hci_le_adv_report_evt code refactoringAndre Guedes2011-09-291-8/+6
| * | Bluetooth: Fix possible NULL pointer dereferenceWaldemar Rymarkiewicz2011-09-291-1/+5
| * | Bluetooth: Mark not declared l2cap_core functions as staticSzymon Janc2011-09-271-6/+6
| * | Bluetooth: use recommended LE connection parametersAnderson Lizardo2011-09-271-7/+7
| * | Bluetooth: Perform L2CAP SDU reassembly without copying dataMat Martineau2011-09-271-163/+80
| * | Bluetooth: Handle fragmented skbs in bt_sock_stream_recvmsg()Mat Martineau2011-09-271-2/+28
| * | Bluetooth: Linearize skbs for use in BNEP, CMTP, HIDP, and RFCOMMMat Martineau2011-09-274-5/+20
* | | Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next...John W. Linville2011-09-309-276/+473
|\| |
| * | Bluetooth: mark l2cap_create_iframe_pdu as staticLuiz Augusto von Dentz2011-09-211-1/+3
| * | Bluetooth: Check 'dev_class' in mgmt_device_found()Andre Guedes2011-09-211-1/+3
| * | Bluetooth: Reduce critical region.Andre Guedes2011-09-211-4/+3
| * | Bluetooth: Fix wrong memcpy size on LE start encryptionAnderson Briglia2011-09-211-1/+1
| * | Bluetooth: Remove support for other SMP keys than the LTKVinicius Costa Gomes2011-09-211-1/+1
| * | Bluetooth: Fix not setting a pending security levelVinicius Costa Gomes2011-09-211-0/+2
| * | Revert "Bluetooth: Add support for communicating keys with userspace"Vinicius Costa Gomes2011-09-211-45/+15
| * | Bluetooth: Use the LTK after receiving a LE Security RequestVinicius Costa Gomes2011-09-211-18/+28
| * | Bluetooth: Fix sending wrong authentication requirementsVinicius Costa Gomes2011-09-211-17/+2
| * | Bluetooth: Add mgmt events for blacklistingAntti Julku2011-09-213-34/+80
| * | Bluetooth: Use the MEDIUM security level for pairingsVinicius Costa Gomes2011-09-211-5/+3
| * | Bluetooth: Require authentication if MITM protection is requestedVinicius Costa Gomes2011-09-211-2/+3
| * | Bluetooth: Move SMP crypto functions to a workqueueVinicius Costa Gomes2011-09-212-102/+177
| * | Bluetooth: Move SMP fields to a separate structureVinicius Costa Gomes2011-09-212-62/+54
| * | Bluetooth: hidp: Add support for NO_INIT_REPORTS quirkDavid Herrmann2011-09-211-0/+3
| * | Bluetooth: Add LE link type for debugfs outputPeter Hurley2011-09-211-0/+2
| * | Bluetooth: Add mgmt command for fast connectable modeAntti Julku2011-09-211-0/+60
| * | Bluetooth: Add link_type information to the mgmt Connected eventVinicius Costa Gomes2011-09-212-3/+4
| * | Bluetooth: Add support for running SMP without a socketVinicius Costa Gomes2011-09-211-2/+8
| * | Bluetooth: Add support for pairing via mgmt over LEVinicius Costa Gomes2011-09-211-2/+13
| * | Bluetooth: Add a flag to indicate that SMP is going onVinicius Costa Gomes2011-09-212-11/+37
| * | Bluetooth: Reset the security timer when a command is queuedVinicius Costa Gomes2011-09-211-12/+3
| * | Bluetooth: make use of connection number to optimize the schedulerLuiz Augusto von Dentz2011-09-211-0/+15
| |/
* | Merge branch 'master' of github.com:davem330/netDavid S. Miller2011-09-2214-95/+102
|\|
| * Bluetooth: Fix timeout on scanning for the second timeOliver Neukum2011-09-151-9/+8
| * Bluetooth: cmtp: Fix session cleanup on failed conn addPeter Hurley2011-08-111-5/+6
| * Bluetooth: hidp: Don't release device ref if never heldPeter Hurley2011-08-111-1/+0
| * Bluetooth: hidp: Only free input device if failed registerPeter Hurley2011-08-111-1/+2
| * Bluetooth: hidp: Fix memory leak of cached report descriptorPeter Hurley2011-08-111-0/+1
| * Bluetooth: hidp: Fix session cleanup on failed conn addPeter Hurley2011-08-111-8/+6
| * Bluetooth: cmtp: Fix deadlock in session deletionPeter Hurley2011-08-113-3/+6
| * Bluetooth: bnep: Fix deadlock in session deletionPeter Hurley2011-08-112-4/+6
| * Bluetooth: Don't use cmd_timer to timeout HCI reset commandSzymon Janc2011-08-111-2/+4
| * Bluetooth: Fixed wrong L2CAP Sock timer valueChen Ganir2011-08-111-1/+1
| * Bluetooth: l2cap: Fix lost wakeup waiting for ERTM acksPeter Hurley2011-08-111-3/+3
| * Bluetooth: cmtp: Fix lost wakeup of session threadPeter Hurley2011-08-111-2/+4
| * Bluetooth: bnep: Fix lost wakeup of session threadPeter Hurley2011-08-111-2/+4
| * Bluetooth: sco: Fix lost wakeups waiting to accept socketPeter Hurley2011-08-111-14/+14
| * Bluetooth: l2cap: Fix lost wakeups waiting to accept socketPeter Hurley2011-08-111-14/+14