aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/bluetooth
Commit message (Expand)AuthorAgeFilesLines
* merge opensource jb u5codeworkx2012-09-2219-5/+4829
* Merge linux-3.0.31 from korg into jellybeancodeworkx2012-09-181-0/+1
|\
| * Bluetooth: hci_core: fix NULL-pointer dereference at unregisterJohan Hovold2012-04-221-0/+1
* | samsung opensource update3Daniel Hillenbrand2012-07-211-0/+1
* | samsung update 1codeworkx2012-06-0215-83/+4405
|/
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2011-05-162-3/+7
|\
| * Bluetooth: Double check sec req for pre 2.1 deviceWaldemar Rymarkiewicz2011-05-111-0/+1
| * Bluetooth: Remove l2cap_sk_listGustavo F. Padovan2011-05-051-3/+3
| * Bluetooth: Handle psm == 0 case inside l2cap_add_psm()Gustavo F. Padovan2011-05-051-1/+0
| * Bluetooth: Add l2cap_add_psm() and l2cap_add_scid()Gustavo F. Padovan2011-05-051-0/+4
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2011-05-054-39/+65
|\ \ | |/
| * Bluetooth: Add store_hint parameter to mgmt_new_keyJohan Hedberg2011-04-282-1/+2
| * Bluetooth: Remove old_key_type from mgmt_ev_new_keyJohan Hedberg2011-04-282-2/+1
| * Bluetooth: Fix link key persistent storage criteriaJohan Hedberg2011-04-281-2/+2
| * Bluetooth: Add confirm_hint parameter to user confirmation requestsJohan Hedberg2011-04-282-1/+3
| * Bluetooth: Add variable SSP auto-accept delay supportJohan Hedberg2011-04-281-0/+3
| * Bluetooth: Add secure flag for mgmt_pin_code_reqWaldemar Rymarkiewicz2011-04-282-1/+2
| * Bluetooth: Map sec_level to link key requirementsWaldemar Rymarkiewicz2011-04-281-0/+1
| * Bluetooth: Add definitions for link key typesWaldemar Rymarkiewicz2011-04-281-0/+9
| * Bluetooth: Add discovering event to the Management interfaceJohan Hedberg2011-04-282-0/+3
| * Bluetooth: Add basic discovery commands to the management interfaceJohan Hedberg2011-04-281-0/+4
| * Bluetooth: Don't export l2cap_sock_opsGustavo F. Padovan2011-04-281-1/+0
| * Bluetooth: Fix memory leak with L2CAP channelsGustavo F. Padovan2011-04-281-0/+1
| * Bluetooth: Move conn to struct l2cap_chanGustavo F. Padovan2011-04-281-3/+4
| * Bluetooth: Move more vars to struct l2cap_chanGustavo F. Padovan2011-04-281-5/+5
| * Bluetooth: Move more channel info to struct l2cap_chanGustavo F. Padovan2011-04-281-7/+7
| * Bluetooth: Move more vars to struct l2cap_chanGustavo F. Padovan2011-04-271-9/+9
| * Bluetooth: Move some more elements to struct l2cap_chanGustavo F. Padovan2011-04-271-5/+7
| * Bluetooth: Rename l2cap_do_connect() to l2cap_chan_connect()Gustavo F. Padovan2011-04-271-1/+1
| * Bluetooth: Move conf_state to struct l2cap_chanGustavo F. Padovan2011-04-271-2/+1
| * Bluetooth: Refactor L2CAP channel allocationGustavo F. Padovan2011-04-271-1/+2
* | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2011-04-251-68/+62
|\ \ | |/
| * Bluetooth: Move tx queue to struct l2cap_chanGustavo F. Padovan2011-04-131-2/+2
| * Bluetooth: Move SREJ list to struct l2cap_chanGustavo F. Padovan2011-04-131-7/+6
| * Bluetooth: Move busy workqueue to struct l2cap_chanGustavo F. Padovan2011-04-071-1/+1
| * Bluetooth: Move srej and busy queues to struct l2cap_chanGustavo F. Padovan2011-04-071-4/+2
| * Bluetooth: Move ERTM timers to struct l2cap_chanGustavo F. Padovan2011-04-071-7/+8
| * Bluetooth: Move remote info to struct l2cap_chanGustavo F. Padovan2011-04-071-5/+5
| * Bluetooth: Move SDU related vars to struct l2cap_chanGustavo F. Padovan2011-04-071-4/+4
| * Bluetooth: Move more ERTM stuff to struct l2cap_chanGustavo F. Padovan2011-04-071-5/+5
| * Bluetooth: Move of ERTM *_seq vars to struct l2cap_chanGustavo F. Padovan2011-04-071-10/+10
| * Bluetooth: Move conn_state to struct l2cap_chanGustavo F. Padovan2011-04-071-2/+3
| * Bluetooth: clean up l2cap_sock_recvmsg()Gustavo F. Padovan2011-04-071-2/+1
| * Bluetooth: Move conf_{req,rsp} stuff to struct l2cap_chanGustavo F. Padovan2011-04-071-5/+6
| * Bluetooth: Move ident to struct l2cap_chanGustavo F. Padovan2011-04-071-2/+2
| * Bluetooth: Remove struct del_listGustavo F. Padovan2011-04-071-5/+0
| * Bluetooth: Use struct list_head for L2CAP channels listGustavo F. Padovan2011-04-071-9/+3
| * Bluetooth: Create struct l2cap_chanGustavo F. Padovan2011-04-071-6/+12
* | net: Remove __KERNEL__ cpp checks from include/netDavid S. Miller2011-04-241-2/+0
|/
* Bluetooth: Add mgmt_remote_name eventJohan Hedberg2011-04-042-0/+7