aboutsummaryrefslogtreecommitdiff
path: root/include/net/bluetooth
AgeCommit message (Collapse)AuthorFilesLines
2011-05-05Merge branch 'master' of ↵John W. Linville4-39/+65
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem Conflicts: drivers/net/wireless/libertas/if_cs.c drivers/net/wireless/rtlwifi/pci.c net/bluetooth/l2cap_sock.c
2011-05-05Bluetooth: Remove l2cap_sk_listGustavo F. Padovan1-3/+3
A new list was added to replace the socket based one. This new list doesn't depent on sock and then fits better inside l2cap_core.c code. It also rename l2cap_chan_alloc() to l2cap_chan_create() and l2cap_chan_free() to l2cap_chan_destroy) Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-05-05Bluetooth: Handle psm == 0 case inside l2cap_add_psm()Gustavo F. Padovan1-1/+0
When the user doesn't specify a psm we have the choose one for the channel. Now we do this inside l2cap_add_psm(). Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-05-05Bluetooth: Add l2cap_add_psm() and l2cap_add_scid()Gustavo F. Padovan1-0/+4
The intention is to get rid of the l2cap_sk_list usage inside l2cap_core.c. l2cap_sk_list will soon be replaced by a list that does not depend on socket usage. Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-28Bluetooth: Add store_hint parameter to mgmt_new_keyJohan Hedberg2-1/+2
Even for keys that shouldn't be stored some use cases require the knowledge of a new key having been created so that the conclusion of a successful pairing can be made. Therefore, always send the mgmt_new_key event but add a store_hint parameter to it to indicate to user space whether the key should be stored or not. Signed-off-by: Johan Hedberg <[email protected]> Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-28Bluetooth: Remove old_key_type from mgmt_ev_new_keyJohan Hedberg2-2/+1
User space shouldn't have any need for the old key type so remove it from the corresponding Management interface event. Signed-off-by: Johan Hedberg <[email protected]> Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-28Bluetooth: Fix link key persistent storage criteriaJohan Hedberg1-2/+2
Link keys should only be stored if very specific criteria of the authentication process are fulfilled. This patch essentially copies the criteria that user space has so far been using to the kernel side so that the management interface works properly. Signed-off-by: Johan Hedberg <[email protected]> Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-28Bluetooth: Add confirm_hint parameter to user confirmation requestsJohan Hedberg2-1/+3
When accepting a pairing request which fulfills the SSP auto-accept criteria we need to push the request all the way to the user for confirmation. This patch adds a new hint to the user_confirm_request management event so user space can know when to show a numeric comparison dialog and when to show a simple yes/no confirmation dialog. Signed-off-by: Johan Hedberg <[email protected]> Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-28Bluetooth: Add variable SSP auto-accept delay supportJohan Hedberg1-0/+3
Some test systems require an arbitrary delay to the auto-accept test cases for Secure Simple Pairing in order for the tests to pass. Previously when this was handled in user space it was worked around by code modifications and recompilation, but now that it's on the kernel side it's more convenient if there's a debugfs interface for it. Signed-off-by: Johan Hedberg <[email protected]> Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-28Bluetooth: Add secure flag for mgmt_pin_code_reqWaldemar Rymarkiewicz2-1/+2
Extend the mgmt_pin_code_request interface to require secure pin code (16 digit) for authentication. This is a kernel part of the secure pin code requirement notification to user space agent. Code styling fix by Johan Hedberg. Signed-off-by: Waldemar Rymarkiewicz <[email protected]> Signed-off-by: Johan Hedberg <[email protected]> Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-28Bluetooth: Map sec_level to link key requirementsWaldemar Rymarkiewicz1-0/+1
Keep the link key type together with connection and use it to map security level to link key requirements. Authenticate and/or encrypt connection if the link is insufficiently secure. Signed-off-by: Waldemar Rymarkiewicz <[email protected]> Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-28Bluetooth: Add definitions for link key typesWaldemar Rymarkiewicz1-0/+9
Introduce the link key types defs and use them instead of magic numbers. Signed-off-by: Waldemar Rymarkiewicz <[email protected]> Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-28Bluetooth: Add discovering event to the Management interfaceJohan Hedberg2-0/+3
This patch adds a new event to the Management interface to track when local adapters are discovering remote devices. For now this only tracks BR/EDR discovery procedures. Signed-off-by: Johan Hedberg <[email protected]> Signed-off-by: Anderson Briglia <[email protected]> Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-28Bluetooth: Add basic discovery commands to the management interfaceJohan Hedberg1-0/+4
This patch adds start_discovery and stop_discovery commands to the management interface. Right now their implementation is fairly simplistic and the parameters are fixed to what user space has defaulted to so far. This is the very initial phase for discovery implementation into the kernel. Next steps include name resolution, LE scanning and bdaddr type handling. Signed-off-by: Johan Hedberg <[email protected]> Signed-off-by: Anderson Briglia <[email protected]> Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-28Bluetooth: Don't export l2cap_sock_opsGustavo F. Padovan1-1/+0
l2cap_sk_ops can be static, it's not used outside l2cap_sock.c Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-28Bluetooth: Fix memory leak with L2CAP channelsGustavo F. Padovan1-0/+1
A new l2cap_chan_free() is added to free the channels. Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-28Bluetooth: Move conn to struct l2cap_chanGustavo F. Padovan1-3/+4
There is no need to the socket deal directly with the channel, most of the time it cares about the channel only. Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-28Bluetooth: Move more vars to struct l2cap_chanGustavo F. Padovan1-5/+5
In this commit, psm, scid and dcid. Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-28Bluetooth: Move more channel info to struct l2cap_chanGustavo F. Padovan1-7/+7
In this commit, omtu, imtu, flush_to, mode and sport. It also remove the pi var from l2cap_sock_sendmsg(). Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-27Bluetooth: Move more vars to struct l2cap_chanGustavo F. Padovan1-9/+9
In this commit all ERTM and Streaming Mode specific vars. Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-27Bluetooth: Move some more elements to struct l2cap_chanGustavo F. Padovan1-5/+7
In this commit sec_level, force_reliable, role_switch and flushable. Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-27Bluetooth: Rename l2cap_do_connect() to l2cap_chan_connect()Gustavo F. Padovan1-1/+1
l2cap_chan_connect() is a much better name and reflects what this functions is doing (or will do once socket dependence is removed from the core). Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-27Bluetooth: Move conf_state to struct l2cap_chanGustavo F. Padovan1-2/+1
First move of elements depending on user data. Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-27Bluetooth: Refactor L2CAP channel allocationGustavo F. Padovan1-1/+2
If the allocation happens at l2cap_sock_create() will be able to use the struct l2cap_chan to store channel info that comes from the user via setsockopt. Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-25Merge branch 'for-davem' of ↵David S. Miller1-68/+62
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
2011-04-24net: Remove __KERNEL__ cpp checks from include/netDavid S. Miller1-2/+0
These header files are never installed to user consumption, so any __KERNEL__ cpp checks are superfluous. Projects should also not copy these files into their userland utility sources and try to use them there. If they insist on doing so, the onus is on them to sanitize the headers as needed. Signed-off-by: David S. Miller <[email protected]>
2011-04-13Bluetooth: Move tx queue to struct l2cap_chanGustavo F. Padovan1-2/+2
tx_q is the queue used by ERTM mode. Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-13Bluetooth: Move SREJ list to struct l2cap_chanGustavo F. Padovan1-7/+6
As part of moving all the Channel related operation to struct l2cap_chan. Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-07Bluetooth: Move busy workqueue to struct l2cap_chanGustavo F. Padovan1-1/+1
As part of the moving channel stuff to l2cap_chan. Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-07Bluetooth: Move srej and busy queues to struct l2cap_chanGustavo F. Padovan1-4/+2
As part of the moving channel stuff to l2cap_chan. Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-07Bluetooth: Move ERTM timers to struct l2cap_chanGustavo F. Padovan1-7/+8
This also triggered a change in l2cap_send_disconn_req() parameters. Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-07Bluetooth: Move remote info to struct l2cap_chanGustavo F. Padovan1-5/+5
As part of the moving channel stuff to l2cap_chan. Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-07Bluetooth: Move SDU related vars to struct l2cap_chanGustavo F. Padovan1-4/+4
As part of the moving channel stuff to l2cap_chan. Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-07Bluetooth: Move more ERTM stuff to struct l2cap_chanGustavo F. Padovan1-5/+5
As part of the moving channel stuff to l2cap_chan. Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-07Bluetooth: Move of ERTM *_seq vars to struct l2cap_chanGustavo F. Padovan1-10/+10
As part of the moving channel to stuff to struct l2cap_chan. Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-07Bluetooth: Move conn_state to struct l2cap_chanGustavo F. Padovan1-2/+3
This is part of "moving things to l2cap_chan". As one the first move it triggered a big number of changes in the funcions parameters, basically changing the struct sock param to struct l2cap_chan. Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-07Bluetooth: clean up l2cap_sock_recvmsg()Gustavo F. Padovan1-2/+1
Move some channel specific stuff to l2cap_core.c, this will make things more clear. Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-07Bluetooth: Move conf_{req,rsp} stuff to struct l2cap_chanGustavo F. Padovan1-5/+6
They are also l2cap_chan specific. Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-07Bluetooth: Move ident to struct l2cap_chanGustavo F. Padovan1-2/+2
ident is chan property, no need to reside on socket. Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-07Bluetooth: Remove struct del_listGustavo F. Padovan1-5/+0
As we use struct list_head to keep L2CAP channels list the workaround with del_list is not needed anymore. Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-07Bluetooth: Use struct list_head for L2CAP channels listGustavo F. Padovan1-9/+3
Use a well known Kernel API is always a good idea than implement your own list. In the future we might use RCU on this list. Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-07Bluetooth: Create struct l2cap_chanGustavo F. Padovan1-6/+12
struct l2cap_chan cames to create a clear separation between what properties and data belongs to the L2CAP channel and what belongs to the socket. By now we just fold the struct sock * in struct l2cap_chan as all the channel info is struct l2cap_pinfo today. In the next commits we will see a move of channel stuff to struct l2cap_chan. Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-04Bluetooth: Add mgmt_remote_name eventJohan Hedberg2-0/+7
This patch adds a new remote_name event to the Management interface which is sent every time the name of a remote device is resolved (over BR/EDR). Signed-off-by: Johan Hedberg <[email protected]> Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-04Bluetooth: Add mgmt_device_found eventJohan Hedberg2-0/+10
This patch adds a device_found event to the Management interface. For now the event only maps to BR/EDR inquiry result HCI events, but in the future the plan is to also use it for the LE device discovery process. Signed-off-by: Johan Hedberg <[email protected]> Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-03-31Merge branch 'master' of ↵Gustavo F. Padovan1-0/+2
git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
2011-03-31Bluetooth: Fix HCI_RESET command synchronizationGustavo F. Padovan1-0/+2
We can't send new commands before a cmd_complete for the HCI_RESET command shows up. Reported-by: Mikko Vinni <[email protected]> Reported-by: Justin P. Mattock <[email protected]> Reported-by: Ed Tomlinson <[email protected]> Signed-off-by: Gustavo F. Padovan <[email protected]> Tested-by: Justin P. Mattock <[email protected]> Tested-by: Mikko Vinni <[email protected]> Tested-by: Ed Tomlinson <[email protected]>
2011-03-31Bluetooth: Add local Extended Inquiry Response (EIR) supportJohan Hedberg2-0/+9
This patch adds automated creation of the local EIR data based on what 16-bit UUIDs are registered and what the device name is. This should cover the majority use cases, however things like 32/128-bit UUIDs, TX power and Device ID will need to be added later to be on par with what bluetoothd is capable of doing (without the Management interface). Signed-off-by: Johan Hedberg <[email protected]> Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-03-31Bluetooth: Remove unused struct l2cap_conn itemGustavo F. Padovan1-1/+0
Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-03-31Bluetooth: Add add/remove_remote_oob_data management commandsSzymon Janc3-0/+45
This patch adds commands to add and remove remote OOB data to the managment interface. Remote data is stored in kernel and can be used by corresponding HCI commands and events when needed. Signed-off-by: Szymon Janc <[email protected]> Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-03-31Bluetooth: Add read_local_oob_data management commandSzymon Janc3-0/+15
This patch adds a command to read local OOB data to the managment interface. The command maps directly to the Read Local OOB Data HCI command. Signed-off-by: Szymon Janc <[email protected]> Signed-off-by: Gustavo F. Padovan <[email protected]>