aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/bluetooth
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2011-11-091-2/+5
|\
| * Merge branch 'master' of ssh://ra.kernel.org/pub/scm/linux/kernel/git/linvill...John W. Linville2011-11-091-2/+5
| |\
| | * Bluetooth: Use miliseconds for L2CAP channel timeoutsAndrzej Kaczmarek2011-11-071-2/+5
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2011-11-071-0/+1
|\ \ \ | |/ /
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2011-11-041-0/+1
| |\ \ | | |/
| | * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padova...John W. Linville2011-11-021-0/+1
| | |\
| | | * Bluetooth: rfcomm: Fix sleep in invalid context in rfcomm_security_cfmSzymon Janc2011-10-141-0/+1
* | | | Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-11-061-11/+13
|\ \ \ \ | |/ / / |/| | |
| * | | bluetooth: macroize two small inlines to avoid module.hPaul Gortmaker2011-10-311-11/+13
| |/ /
* | | treewide: use __printf not __attribute__((format(printf,...)))Joe Perches2011-10-311-1/+1
|/ /
* | Bluetooth: Perform L2CAP SDU reassembly without copying dataMat Martineau2011-09-271-2/+1
* | Bluetooth: Add mgmt events for blacklistingAntti Julku2011-09-212-0/+12
* | Bluetooth: Move SMP crypto functions to a workqueueVinicius Costa Gomes2011-09-211-1/+8
* | Bluetooth: Move SMP fields to a separate structureVinicius Costa Gomes2011-09-213-9/+11
* | Bluetooth: Add mgmt command for fast connectable modeAntti Julku2011-09-212-0/+15
* | Bluetooth: Add link_type information to the mgmt Connected eventVinicius Costa Gomes2011-09-212-1/+2
* | Bluetooth: Use the same timeouts for both ACL and LE linksVinicius Costa Gomes2011-09-211-1/+1
* | Bluetooth: Add a flag to indicate that SMP is going onVinicius Costa Gomes2011-09-211-0/+1
* | Bluetooth: make use of connection number to optimize the schedulerLuiz Augusto von Dentz2011-09-211-0/+16
|/
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2011-07-156-12/+75
|\
| * Bluetooth: Fixes l2cap "command reject" reply according to specIlia Kolomisnky2011-07-111-1/+18
| * Bluetooth: Add support for returning the encryption key sizeVinicius Costa Gomes2011-07-081-0/+1
| * Bluetooth: Add support for storing the key sizeVinicius Costa Gomes2011-07-081-1/+2
| * Bluetooth: Remove unused field in hci_connVinicius Costa Gomes2011-07-081-1/+0
| * Bluetooth: Add functions to manipulate the link key list for SMPVinicius Costa Gomes2011-07-081-0/+5
| * Bluetooth: Add new structures for supporting SM key distributionVinicius Costa Gomes2011-07-083-0/+22
| * Bluetooth: Add support for SMP phase 3 (key distribution)Vinicius Costa Gomes2011-07-081-0/+1
| * Bluetooth: Remove L2CAP busy queueMat Martineau2011-07-071-4/+0
| * Bluetooth: Use event-driven approach for handling ERTM receive bufferMat Martineau2011-07-071-0/+2
| * Bluetooth: Add lmp_host_le_capable() macroAndre Guedes2011-07-062-0/+6
| * Bluetooth: Add enable_le module parameterAndre Guedes2011-07-061-0/+1
| * Bluetooth: Write LE Host Supported commandAndre Guedes2011-07-061-0/+6
| * Bluetooth: Add extfeatures to struct hci_devAndre Guedes2011-07-062-0/+5
| * Bluetooth: Clean up unused struct hci_conn itemsGustavo F. Padovan2011-07-011-2/+0
| * Bluetooth: Add bt_printkJoe Perches2011-06-301-3/+6
| * Bluetooth: Rename function bt_err to bt_to_errnoJoe Perches2011-06-301-1/+1
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2011-06-247-65/+259
|\ \ | |/
| * Bluetooth: Use bit operations on conn_stateGustavo F. Padovan2011-06-161-12/+14
| * Bluetooth: use bit operation on conf_stateGustavo F. Padovan2011-06-161-9/+11
| * Bluetooth: Add blacklisting support for mgmt interfaceAntti Julku2011-06-161-0/+10
| * Bluetooth: Move blacklisting functions to hci_coreAntti Julku2011-06-161-0/+2
| * Bluetooth: Add key size checks for SMPVinicius Costa Gomes2011-06-142-0/+4
| * Bluetooth: Add support for SMP timeoutVinicius Costa Gomes2011-06-141-0/+2
| * Bluetooth: Update the security level when link is encryptedVinicius Costa Gomes2011-06-131-0/+3
| * Bluetooth: Add support for LE Start EncryptionVinicius Costa Gomes2011-06-132-0/+40
| * Bluetooth: Add SMP confirmation checks methodsAnderson Briglia2011-06-131-0/+1
| * Bluetooth: Add SMP confirmation structsAnderson Briglia2011-06-131-0/+5
| * Bluetooth: Add support for using the crypto subsystemVinicius Costa Gomes2011-06-131-0/+2
| * Bluetooth: Add simple SMP pairing negotiationAnderson Briglia2011-06-131-0/+17
| * Bluetooth: Implement the first SMP commandsAnderson Briglia2011-06-131-0/+26