aboutsummaryrefslogtreecommitdiff
path: root/include/net/bluetooth
AgeCommit message (Collapse)AuthorFilesLines
2012-06-05Bluetooth: A2MP: Definitions for A2MP commandsAndrei Emeltchenko1-0/+73
Define A2MP command IDs and packet structures. Signed-off-by: Andrei Emeltchenko <[email protected]> Signed-off-by: Gustavo Padovan <[email protected]>
2012-06-05Bluetooth: A2MP: Build and Send msg helpersAndrei Emeltchenko1-0/+7
Helper function to build and send A2MP messages. Signed-off-by: Andrei Emeltchenko <[email protected]> Signed-off-by: Gustavo Padovan <[email protected]>
2012-06-05Bluetooth: A2MP: AMP Manager basic functionsAndrei Emeltchenko2-0/+31
Define AMP Manager and some basic functions. Signed-off-by: Andrei Emeltchenko <[email protected]> Signed-off-by: Gustavo Padovan <[email protected]>
2012-06-05Bluetooth: A2MP: Create A2MP channelAndrei Emeltchenko1-0/+6
Create and initialize fixed A2MP channel Signed-off-by: Andrei Emeltchenko <[email protected]> Signed-off-by: Gustavo Padovan <[email protected]>
2012-06-05Bluetooth: Add l2cap_chan->ops->ready()Andrei Emeltchenko1-0/+1
This move socket specific code to l2cap_sock.c. Signed-off-by: Andrei Emeltchenko <[email protected]> Signed-off-by: Gustavo Padovan <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]>
2012-06-05Bluetooth: Move clean up code and set of SOCK_ZAPPED to l2cap_sock.cAndrei Emeltchenko1-0/+1
This remove a bit more of socket code from l2cap core, this calls set the SOCK_ZAPPED and do some clean up depending on the socket state. Reported-by: Mat Martineau <[email protected]> Signed-off-by: Andrei Emeltchenko <[email protected]> Signed-off-by: Gustavo Padovan <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]>
2012-06-05Bluetooth: Use chan as parameters for l2cap chan opsGustavo Padovan1-4/+6
Use chan instead of void * makes more sense here. Signed-off-by: Gustavo Padovan <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]>
2012-06-05Bluetooth: Define HCI AMP cmd structAndrei Emeltchenko1-0/+81
Add HCI commands to deal with Bluetooth AMP controllers. Those commands will be used by bluetooth and softamp code. Signed-off-by: Andrei Emeltchenko <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]>
2012-06-05Bluetooth: Define and use PSM identifiersAndrei Emeltchenko1-0/+4
Define assigned Protocol and Service Multiplexor (PSM) identifiers and use them instead of magic numbers. Signed-off-by: Andrei Emeltchenko <[email protected]> Signed-off-by: Gustavo Padovan <[email protected]>
2012-06-05Bluetooth: Define L2CAP conf continuation flagAndrei Emeltchenko1-0/+3
Define Continuation flag which the only flag used from Flags field in L2CAP Configuration Request and Response. Signed-off-by: Andrei Emeltchenko <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]>
2012-06-05Bluetooth: Remove unnecessary headers includeGustavo Padovan3-5/+0
Most of the include were unnecessary or already included by some other header. Replace module.h by export.h where possible. Signed-off-by: Gustavo Padovan <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]>
2012-06-05Bluetooth: Fix coding style in include/net/bluetoothGustavo Padovan3-19/+23
Fix all warning and errors reported by checkpatch but license trailing whitespace and bdaddr_t definition. Signed-off-by: Gustavo Padovan <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]>
2012-06-05Bluetooth: Use defined link key sizeAndrei Emeltchenko2-3/+5
Remove magic number with defined link key size. Signed-off-by: Andrei Emeltchenko <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]>
2012-06-05Bluetooth: Rename HCI_QUIRK_NO_RESET to HCI_QUIRK_RESET_ON_CLOSESzymon Janc1-1/+1
HCI_QUIRK_NO_RESET name is misleading - purpose of this quirk is to reset device on close instead of init, not to not reset at all. Rename it to HCI_QUIRK_RESET_ON_CLOSE to avoid confusion. Signed-off-by: Szymon Janc <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]>
2012-06-05Bluetooth: Fix trailing whitespaces in license textGustavo Padovan1-6/+6
As reported by checkpatch.pl Signed-off-by: Gustavo Padovan <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]>
2012-06-05Bluetooth: Remove unused ERTM control field macrosMat Martineau1-168/+0
Now that l2cap_ctrl is used to set up control fields, these macros are not needed. Signed-off-by: Mat Martineau <[email protected]> Signed-off-by: Gustavo Padovan <[email protected]>
2012-06-05Bluetooth: Check rules when setting retransmit or monitor timersMat Martineau1-4/+0
The ERTM specification requires the retransmit timer to be cancelled when the monitor timer is set. The retransmit timer cannot be set again while the monitor timer is pending. Signed-off-by: Mat Martineau <[email protected]> Signed-off-by: Gustavo Padovan <[email protected]>
2012-06-05Bluetooth: Remove receive code that has been supercededMat Martineau1-8/+0
This deletes the receive code that had handlers for each frame type at the top level, and then had logic to determine the receive state within each handler. Signed-off-by: Mat Martineau <[email protected]> Signed-off-by: Gustavo Padovan <[email protected]>
2012-06-05Bluetooth: Fix early return from l2cap_chan_delMat Martineau1-0/+1
This fixes a regression from commit 2ead70b8390d199ca04cd35311b51f5f3676079e that is present in all kernels starting at v3.0. When L2CAP information was moved to struct l2cap_chan, a check was added to l2cap_chan_del to avoid certain cleanup operations when ERTM or streaming mode had not yet been initialized. The logic in the check did not take in to account that chan->conf_state is set to 0 in l2cap_chan_ready, so l2cap_chan_del failed to cancel timers and leaked memory any time the ERTM queues or lists were not empty. This change makes sure that l2cap_chan_del only returns early if ERTM initialization was not performed. Signed-off-by: Mat Martineau <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]>
2012-05-16Bluetooth: Create flags for bt_sk()Gustavo Padovan1-2/+6
defer_setup and suspended are now flags into bt_sk(). Signed-off-by: Gustavo Padovan <[email protected]> Signed-off-by: Johan Hedberg <[email protected]>
2012-05-16Bluetooth: Lock the L2CAP channel when sendingMat Martineau1-2/+0
The ERTM and streaming mode transmit queue must only be accessed while the L2CAP channel lock is held. Locking the channel before calling l2cap_chan_send ensures that multiple threads cannot simultaneously manipulate the queue when sending and receiving concurrently. L2CAP channel locking had previously moved to the l2cap_chan struct instead of the associated socket, so some of the old socket locking can also be removed in this patch. Signed-off-by: Mat Martineau <[email protected]> Signed-off-by: Gustavo Padovan <[email protected]>
2012-05-16Bluetooth: Fix EIR data generation for mgmt_device_foundVishal Agarwal1-0/+17
The mgmt_device_found function expects to receive only the significant part of the EIR data so it needs to be removed before calling the function. This patch adds a new eir_get_length() helper function to calculate the length of the significant part. Signed-off-by: Vishal Agarwal <[email protected]> Signed-off-by: Johan Hedberg <[email protected]>
2012-05-16Merge git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetoothGustavo Padovan1-0/+1
2012-05-14Bluetooth: notify userspace of security level changeGustavo Padovan1-0/+1
It fixes L2CAP socket based security level elevation during a connection. The HID profile needs this (for keyboards) and it is the only way to achieve the security level elevation when using the management interface to talk to the kernel (hence the management enabling patch being the one that exposes this issue). It enables the userspace a security level change when the socket is already connected and create a way to notify the socket the result of the request. At the moment of the request the socket is made non writable, if the request fails the connections closes, otherwise the socket is made writable again, POLL_OUT is emmited. Signed-off-by: Gustavo Padovan <[email protected]> Acked-by: Marcel Holtmann <[email protected]> Signed-off-by: Johan Hedberg <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2012-05-09Bluetooth: Refactor L2CAP ERTM and streaming transmit segmentationMat Martineau1-0/+1
Use more common code for ERTM and streaming mode segmentation and transmission, and begin using skb control block data for delaying extended or enhanced header generation until just before the packet is transmitted. This code is also better suited for resegmentation, which is needed when L2CAP links are reconfigured after an AMP channel move. Signed-off-by: Mat Martineau <[email protected]> Reviewed-by: Ulisses Furquim <[email protected]> Signed-off-by: Gustavo Padovan <[email protected]>
2012-05-09Bluetooth: Enable Low Energy support by defaultMarcel Holtmann1-1/+0
The Bluetooth Low Energy support so far was disabled by default via a module parameter. With this change the module parameter will be removed and Low Energy is enabled by default. Signed-off-by: Marcel Holtmann <[email protected]> Signed-off-by: Gustavo Padovan <[email protected]>
2012-05-09Bluetooth: Remove unused hci_le_ltk_neg_reply()Syam Sidhardhan1-2/+0
No one is using hci_le_ltk_neg_reply() in bluetooth subsystem. Signed-off-by: Syam Sidhardhan <[email protected]> Signed-off-by: Gustavo Padovan <[email protected]>
2012-05-09Bluetooth: Remove unused hci_le_ltk_reply()Syam Sidhardhan1-1/+0
In this API, we were using sizeof operator for an array given as function argument, which is invalid. However this API is not used anywhere. Signed-off-by: Syam Sidhardhan <[email protected]> Signed-off-by: Gustavo Padovan <[email protected]>
2012-05-09Bluetooth: Remove duplicate structure members from bt_skb_cbMat Martineau1-3/+0
These values are now in the nested l2cap_ctrl struct. Signed-off-by: Mat Martineau <[email protected]> Acked-by: Marcel Holtmann <[email protected]> Signed-off-by: Gustavo Padovan <[email protected]>
2012-05-09Bluetooth: Improve ERTM sequence number offset calculationMat Martineau1-7/+4
Instead of using modular division, the offset can be calculated using only addition and subtraction. The previous calculation did not work as intended and was more difficult to understand, involving unsigned integer underflow and a check for a negative value where one was not possible. Signed-off-by: Mat Martineau <[email protected]> Acked-by: Marcel Holtmann <[email protected]> Signed-off-by: Gustavo Padovan <[email protected]>
2012-05-09Bluetooth: Remove advertising cacheAndre Guedes1-9/+0
User-space pass the remote device address type to kernel through struct sockaddr_l2 what makes the advertising useless. This patch removes all advertising cache code. Signed-off-by: Andre Guedes <[email protected]> Acked-by: Johan Hedberg <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]>
2012-05-09Bluetooth: Use address type info from user-spaceAndre Guedes1-1/+1
In order to establish a LE connection we need the address type information. User-space already pass this information to kernel through struct sockaddr_l2. This patch adds the dst_type parameter to l2cap_chan_connect so we are able to pass the address type info from user-space down to hci_conn layer. Signed-off-by: Andre Guedes <[email protected]> Acked-by: Johan Hedberg <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]>
2012-05-09Bluetooth: Add dst_type parameter to hci_connectAndre Guedes1-1/+1
This patch adds the dst_type parameter to hci_connect function. Instead of searching the address type in advertising cache, we use the dst_type parameter to establish LE connections. The dst_type is ignored for BR/EDR connection establishment. Signed-off-by: Andre Guedes <[email protected]> Acked-by: Johan Hedberg <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]>
2012-05-09Bluetooth: Move bdaddr_to_le to hci_coreAndre Guedes1-0/+2
This patch moves the helper function bdaddr_to_le to hci_core, so it can be used in mgmt.c and hci_conn.c. Signed-off-by: Andre Guedes <[email protected]> Acked-by: Johan Hedberg <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]>
2012-05-09Bluetooth: Add address type to struct sockaddr_l2Andre Guedes1-0/+1
This patch adds the address type info to struct sockaddr_l2 so user-space can inform the remote device address type required to establish LE connections. Soon, instead of looking the advertising cache up to discover the address type, we'll use this address type info to establish LE connections. Signed-off-by: Andre Guedes <[email protected]> Acked-by: Johan Hedberg <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]>
2012-05-09Bluetooth: Move address type macros to bluetooth.hAndre Guedes2-10/+11
This patch moves address type macros to bluetooth.h since they will be used by management interface and Bluetooth socket interface. It also replaces the macro prefix MGMT_ADDR_ by BDADDR_. Signed-off-by: Andre Guedes <[email protected]> Acked-by: Johan Hedberg <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]>
2012-05-09Bluetooth: trivial: Remove empty lineAndrei Emeltchenko1-1/+0
Signed-off-by: Andrei Emeltchenko <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]>
2012-05-09Bluetooth: Remove strtoba header declared but not definedSyam Sidhardhan1-1/+0
No one is using strtoba() in the bluetooth subsystem. Signed-off-by: Syam Sidhardhan <[email protected]> Signed-off-by: Gustavo Padovan <[email protected]>
2012-05-09Bluetooth: remove header declared but not definedSyam Sidhardhan1-2/+0
hci_del_off_timer() doesn't exist anymore. Signed-off-by: Syam Sidhardhan <[email protected]> Signed-off-by: Gustavo Padovan <[email protected]>
2012-05-09Bluetooth: Add the l2cap_seq_list structure for tracking framesMat Martineau1-0/+12
A sequence list is a data structure used to track frames that need to be retransmitted, and frames that have been requested for retransmission by the remote device. It can compactly represent a list of sequence numbers within the ERTM transmit window. Memory for the list is allocated once at connection time, and common operations in ERTM are O(1). Signed-off-by: Mat Martineau <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]>
2012-05-09Bluetooth: Remove err parameter from alloc_skb()Gustavo Padovan1-1/+1
Use ERR_PTR maginc instead. Signed-off-by: Gustavo Padovan <[email protected]> Acked-by: Marcel Holtmann <[email protected]> Signed-off-by: Johan Hedberg <[email protected]>
2012-05-09Bluetooth: Adds set_default function in L2CAP setupAndrei Emeltchenko1-0/+1
Some parameters in L2CAP chan are set to default similar way in socket based channels and A2MP channels. Adds common function which sets all defaults. Signed-off-by: Andrei Emeltchenko <[email protected]> Signed-off-by: Gustavo Padovan <[email protected]>
2012-05-09Bluetooth: Remove MGMT_ADDR_INVALID macroAndre Guedes1-1/+0
This patch removes the MGMT_ADDR_INVALID macro. If the address type isn't LE, we consider it is BR/EDR type. Signed-off-by: Andre Guedes <[email protected]> Signed-off-by: Johan Hedberg <[email protected]>
2012-05-09Bluetooth: Remove sk parameter from l2cap_chan_create()Gustavo Padovan1-1/+1
Following the separation if core and sock code this change avoid manipulation of sk inside l2cap_chan_create(). Signed-off-by: Gustavo Padovan <[email protected]>
2012-05-09Bluetooth: Add a structure to carry ERTM data in skb control blocksMat Martineau1-0/+13
Every field from ERTM control headers is now carried in the control block so it only has to be parsed or generated once, and can be efficiently accessed throughout the ERTM code. Signed-off-by: Mat Martineau <[email protected]> Acked-by: Marcel Holtmann <[email protected]> Signed-off-by: Gustavo Padovan <[email protected]>
2012-05-09Bluetooth: Add definitions and struct members for new ERTM state machineMat Martineau1-0/+49
Adds some missing values for control field parsing, additional data for the new state machine, and enumerations for states, incoming packet classification, and state machine events. Signed-off-by: Mat Martineau <[email protected]> Acked-by: Marcel Holtmann <[email protected]> Signed-off-by: Gustavo Padovan <[email protected]>
2012-05-09Bluetooth: Comments and style fixesAndrei Emeltchenko1-3/+8
Add comments to timer implementation and style fixes. Signed-off-by: Andrei Emeltchenko <[email protected]> Acked-by: Marcel Holtmann <[email protected]> Signed-off-by: Gustavo Padovan <[email protected]>
2012-05-09Bluetooth: Add HCI_PERIODIC_INQ to dev_flagsAndre Guedes1-0/+1
This patch adds the HCI_PERIODIC_INQ flag to dev_flags. This flag tracks if periodic inquiry is enabled or not. Signed-off-by: Andre Guedes <[email protected]> Acked-by: Marcel Holtmann <[email protected]> Signed-off-by: Gustavo Padovan <[email protected]>
2012-05-09Bluetooth: Add Periodic Inquiry command complete handlerAndre Guedes1-0/+2
This patch adds a handler function to Periodic Inquiry command complete event. Signed-off-by: Andre Guedes <[email protected]> Acked-by: Marcel Holtmann <[email protected]> Signed-off-by: Gustavo Padovan <[email protected]>
2012-05-09Bluetooth: Add hci_cancel_le_scan() to hci_coreAndre Guedes1-0/+1
This patch adds to hci_core the hci_cancel_le_scan function which should be used to cancel an ongoing LE scan. Signed-off-by: Andre Guedes <[email protected]> Acked-by: Marcel Holtmann <[email protected]> Signed-off-by: Johan Hedberg <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.