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. Linville2013-11-214-1/+14
|\
| * Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2013-11-154-1/+14
| |\
| | * Bluetooth: Fix rejecting SMP security request in slave roleJohan Hedberg2013-11-131-0/+3
| | * Bluetooth: Fix crash in l2cap_chan_send after l2cap_chan_delSeung-Woo Kim2013-11-131-0/+3
| | * Bluetooth: Fix to set proper bdaddr_type for RFCOMM connectSeung-Woo Kim2013-11-131-0/+1
| | * Bluetooth: Fix RFCOMM bind fail for L2CAP sockSeung-Woo Kim2013-11-131-0/+2
| | * Bluetooth: Fix issue with RFCOMM getsockopt operationMarcel Holtmann2013-11-131-1/+5
* | | net: rework recvmsg handler msg_name and msg_namelen logicHannes Frederic Sowa2013-11-204-11/+2
|/ /
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2013-11-0814-900/+1434
|\ \
| * | Bluetooth: Remove sk member from struct l2cap_chanGustavo Padovan2013-10-211-2/+0
| * | Bluetooth: Use bt_cb(skb)->chan to send raw data backGustavo Padovan2013-10-211-4/+3
| * | Bluetooth: Add L2CAP channel to skb private dataGustavo Padovan2013-10-211-0/+2
| * | Bluetooth: Remove parent socket usage from l2cap_core.cGustavo Padovan2013-10-212-10/+8
| * | Bluetooth: Remove socket lock from l2cap_state_change()Gustavo Padovan2013-10-211-24/+7
| * | Bluetooth: Hold socket in defer callback in L2CAP socketGustavo Padovan2013-10-212-14/+9
| * | Bluetooth: Do not access chan->sk directlyGustavo Padovan2013-10-211-1/+2
| * | Bluetooth: Remove not used struct sockGustavo Padovan2013-10-211-3/+1
| * | Bluetooth: Fix enabling fast connectable on LE-only controllersJohan Hedberg2013-10-211-0/+3
| * | Bluetooth: Update Set Discoverable to support LEJohan Hedberg2013-10-201-11/+69
| * | Bluetooth: Move HCI_LIMITED_DISCOVERABLE changes to a general placeJohan Hedberg2013-10-201-4/+6
| * | Bluetooth: Fix sending write_scan_enable when BR/EDR is disabledJohan Hedberg2013-10-201-2/+5
| * | Bluetooth: Move mgmt_pending_find to avoid forward declarationsJohan Hedberg2013-10-201-12/+12
| * | Bluetooth: Fix updating settings when there are no HCI commands to sendJohan Hedberg2013-10-201-2/+2
| * | Bluetooth: Refactor set_connectable settings update to separate functionJohan Hedberg2013-10-201-19/+27
| * | Bluetooth: Add missing check for BREDR_ENABLED flag in update_class()Johan Hedberg2013-10-201-0/+3
| * | Bluetooth: Check for flag instead of features in update_adv_data()Johan Hedberg2013-10-201-1/+1
| * | Bluetooth: Check for flag instead of features in update_scan_rsp_data()Johan Hedberg2013-10-201-1/+1
| * | Bluetooth: Fix minor coding style issue in hci_core.cMarcel Holtmann2013-10-191-5/+5
| * | Bluetooth: Fix UUID values in debugfs fileMarcel Holtmann2013-10-191-12/+10
| * | Bluetooth: Add support for setting DUT modeMarcel Holtmann2013-10-191-0/+73
| * | Bluetooth: Expose debugfs settings for LE connection intervalMarcel Holtmann2013-10-192-2/+65
| * | Bluetooth: Add support for setting SSP debug modeMarcel Holtmann2013-10-192-1/+55
| * | Bluetooth: Remove interval parameter from HCI connectionMarcel Holtmann2013-10-191-1/+0
| * | Bluetooth: Add LE features to debugfs if availableMarcel Holtmann2013-10-191-1/+8
| * | Bluetooth: Expose setting if debug keys are used or notMarcel Holtmann2013-10-191-0/+20
| * | Bluetooth: Expose debugfs entry read/write own address typeMarcel Holtmann2013-10-191-0/+30
| * | Bluetooth: Select the own address type during initial setup phaseMarcel Holtmann2013-10-193-15/+15
| * | Bluetooth: Expose current list of long term keys via debugfsMarcel Holtmann2013-10-191-0/+32
| * | Bluetooth: Expose white list size information in debugfsMarcel Holtmann2013-10-191-1/+4
| * | Bluetooth: Remove bus attribute in favor of hierarchyMarcel Holtmann2013-10-191-31/+0
| * | Bluetooth: Expose current list of link keys via debugfsMarcel Holtmann2013-10-191-0/+30
| * | Bluetooth: Move export of class of device information into hci_core.cMarcel Holtmann2013-10-192-10/+26
| * | Bluetooth: Store local version information only during setup phaseMarcel Holtmann2013-10-191-8/+7
| * | Bluetooth: Move manufacturer, hci_ver and hci_rev into hci_core.cMarcel Holtmann2013-10-192-27/+4
| * | Bluetooth: Remove debug entry for connection featuresMarcel Holtmann2013-10-191-14/+0
| * | Bluetooth: Add workaround for buggy max_page features page valueMarcel Holtmann2013-10-192-1/+10
| * | Bluetooth: Move HCI device features into hci_core.cMarcel Holtmann2013-10-192-15/+33
| * | Bluetooth: Block ATT connection on LE when device is blockedMarcel Holtmann2013-10-181-5/+16
| * | Bluetooth: Use hcon directly instead of conn->hcon where possibleMarcel Holtmann2013-10-182-5/+4
| * | Bluetooth: Use BDADDR_BREDR type for old blacklist ioctl interfaceMarcel Holtmann2013-10-181-2/+2