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-09-083-4/+35
|\
| * Bluetooth: Fix hci_conn reference counting for auto-connectionsJohan Hedberg2014-08-203-4/+35
* | Bluetooth: Fix ERTM L2CAP resend packetLukasz Rymanowski2014-08-141-3/+5
* | Bluetooth: Improve data packing in SAR modeLukasz Rymanowski2014-08-141-4/+1
* | Bluetooth: Make smp_chan_destroy() private to smp.cJohan Hedberg2014-08-142-52/+50
* | Bluetooth: Always call smp_distribute_keys() from a workqueueJohan Hedberg2014-08-141-16/+26
* | Bluetooth: Move canceling security_timer into smp_chan_destroy()Johan Hedberg2014-08-141-6/+6
* | Bluetooth: Remove unused l2cap_conn->security_timerJohan Hedberg2014-08-141-17/+1
* | Bluetooth: Add SMP-internal timeout callbackJohan Hedberg2014-08-141-9/+43
* | Bluetooth: Fix double free of SMP data skbJohan Hedberg2014-08-141-7/+6
* | Bluetooth: Call l2cap_conn_shutdown() when SMP recv callback failsJohan Hedberg2014-08-141-1/+19
* | Bluetooth: Add public l2cap_conn_shutdown() API to request disconnectionJohan Hedberg2014-08-141-0/+25
* | Bluetooth: Use L2CAP resume callback to call smp_distribute_keysJohan Hedberg2014-08-143-191/+196
* | Bluetooth: Convert SMP to use l2cap_chan infrastructureJohan Hedberg2014-08-143-67/+66
* | Bluetooth: Make AES crypto context private to SMPJohan Hedberg2014-08-143-27/+32
* | Bluetooth: Add SMP L2CAP channel skeletonJohan Hedberg2014-08-141-1/+130
* | Bluetooth: Move SMP (de)initialization to smp.cJohan Hedberg2014-08-143-30/+31
* | Bluetooth: Move SMP initialization after HCI initJohan Hedberg2014-08-141-7/+3
* | Bluetooth: Refactor SMP (de)initialization into separate functionsJohan Hedberg2014-08-141-12/+34
* | Bluetooth: Fix IRK lookup when tfm_aes is not availableJohan Hedberg2014-08-141-0/+3
* | Bluetooth: Fix hci_update_random_address() error return for no cryptoJohan Hedberg2014-08-141-0/+6
* | Bluetooth: Fix using HCI_CONN_LE_SMP_PEND to check for SMP contextJohan Hedberg2014-08-141-1/+1
* | Bluetooth: Call l2cap_le_conn_ready after notifying channelsJohan Hedberg2014-08-141-3/+3
* | Bluetooth: Call L2CAP teardown callback before clearing chan->connJohan Hedberg2014-08-141-2/+2
* | Bluetooth: Move parts of fixed channel initialization to l2cap_add_scidJohan Hedberg2014-08-142-9/+4
* | Bluetooth: Remove special ATT data channel handlingJohan Hedberg2014-08-141-79/+0
* | Bluetooth: Improve fixed channel lookup based on link typeJohan Hedberg2014-08-141-3/+8
* | Bluetooth: Move L2CAP fixed channel creation into l2cap_conn_cfmJohan Hedberg2014-08-141-44/+80
* | Bluetooth: Refactor l2cap_connect_cfmJohan Hedberg2014-08-141-5/+8
* | Bluetooth: Remove special handling of ATT in l2cap_security_cfm()Johan Hedberg2014-08-141-9/+2
* | Bluetooth: Resume BT_CONNECTED state after LE security elevationJohan Hedberg2014-08-141-0/+6
* | Bluetooth: Fix __l2cap_no_conn_pending() usage with all channelsJohan Hedberg2014-08-141-0/+3
* | Bluetooth: Fix reference counting of global L2CAP channelsJohan Hedberg2014-08-141-8/+28
* | Bluetooth: Fix confusion between parent and child channel for 6lowpanJohan Hedberg2014-08-141-5/+5
* | Bluetooth: Remove redundant check for remote_key_distJohan Hedberg2014-08-141-2/+1
* | Bluetooth: Disable page scan if all whitelisted devices are connectedJohan Hedberg2014-08-142-4/+27
* | Bluetooth: Create unified helper function for updating page scanJohan Hedberg2014-08-142-60/+43
* | Bluetooth: Add convenience function to check for pending power offJohan Hedberg2014-08-141-24/+28
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2014-08-0622-1570/+3620
|\
| * Merge tag 'master-2014-07-31' of git://git.kernel.org/pub/scm/linux/kernel/gi...David S. Miller2014-08-056-47/+287
| |\
| | * Bluetooth: Always use non-bonding requirement when not bondableJohan Hedberg2014-07-301-3/+8
| | * Bluetooth: Rename pairable mgmt setting to bondableJohan Hedberg2014-07-301-7/+7
| | * Bluetooth: Rename HCI_PAIRABLE to HCI_BONDABLEJohan Hedberg2014-07-304-11/+11
| | * Bluetooth: Fix sparse warning from HID new leds handlingMarcel Holtmann2014-07-301-1/+1
| | * Bluetooth: Fix check for connected state when pairingJohan Hedberg2014-07-301-1/+1
| | * Bluetooth: Fix SMP context tracking leading to a kernel crashJohan Hedberg2014-07-301-5/+8
| | * Bluetooth: Fix incorrectly disabling page scan when toggling connectableJohan Hedberg2014-07-281-1/+13
| | * Bluetooth: Fix clearing HCI_PSCAN flagJohan Hedberg2014-07-281-1/+1
| | * Bluetooth: Set Simultaneous LE and BR/EDR controller option to zeroMarcel Holtmann2014-07-272-4/+4
| | * Bluetooth: Expose default LE advertising interval via debugfsGeorg Lukas2014-07-261-0/+60