- 05 Jun, 2012 40 commits
-
-
Andre Guedes authored
This patch renames L2CAP_LE_DEFAULT_MTU macro to L2CAP_LE_MIN_MTU since it represents the minimum MTU value, not the default MTU value for LE. Signed-off-by:
Andre Guedes <andre.guedes@openbossa.org> Signed-off-by:
Gustavo Padovan <gustavo.padovan@collabora.co.uk>
-
Andre Guedes authored
If user tries to set an invalid MTU value, l2cap_sock_setsockopt_old should return -EINVAL. Signed-off-by:
-
Andre Guedes authored
This patch changes the default MTU value for L2CAP ATT fixed channel to L2CAP_DEFAULT_MTU (672 octets). Differently from others L2CAP channels, in L2CAP ATT fixed channel there is no MTU negotiation. The MTU value for that channel is up to the L2CAP implementation. The only restriction in L2CAP spec is the MTU value must not be less than 23 octets. At ATT protocol level (on top of L2CAP), we have the ATT_MTU which defines the maximum size of any ATT message sent between client and server. GATT profile defines ATT_MTU default value to 23 octets. If a GATT based profile wants to use ATT_MTU greater than 23 octets (e.g. HID over GATT profile), it should negotiate a new value by executing the GATT Exchange MTU sub-procedure. Thus, in order to support any value of ATT_MTU negotiated at ATT protocol level, our L2CAP implementation should have L2CAP ATT fixed channel MTU equal or greater than ATT_MAX_MTU (512 octets). Signed-off-by:
-
Andrzej Kaczmarek authored
This patch changes way LE Connection Complete event with error status are handled. BDADDR returned in such event packet do not need to be valid and should not be used to search for existing hci_conn. Instead, any hci_conn with BT_CONNECT state should be matched since there can be only one pending LE outgoing connection at any time. If not handled properly, appriopriate hci_conn will not be removed and subsequent connection to given peer will try to reuse it without making actual connection attempt. 2012-05-07 11:21:39.133378 < HCI Command: LE Create Connection (0x08|0x000d) plen 25 bdaddr 00:22:D0:10:13:EE type 1 2012-05-07 11:21:39.138774 > HCI Event: Command Status (0x0f) plen 4 LE Create Connection (0x08|0x000d) status 0x00 ncmd 1 2012-05-07 11:21:44.752854 < HCI Command: LE Create Connection Cancel (0x08|0x000e) plen 0 2012-05-07 11:21:44.759475 > HCI Event: Command Complete (0x0e) plen 4 LE Create Connection Cancel (0x08|0x000e) ncmd 1 2012-05-07 11:21:44.764479 > HCI Event: LE Meta Event (0x3e) plen 19 LE Connection Complete status 0x02 handle 0, role master bdaddr 00:00:00:00:00:00 (Public) [14898.739425] [6603] hci_connect: hci0 dst 00:22:D0:10:13:EE [14898.739429] [6603] hci_conn_add: hci0 dst 00:22:D0:10:13:EE [14898.739434] [6603] hci_conn_init_sysfs: conn ffff880079f03000 [14898.739440] [6603] hci_send_cmd: hci0 opcode 0x200d plen 25 [14898.739443] [6603] hci_send_cmd: skb len 28 [14898.739487] [6603] hci_chan_create: hci0 conn ffff880079f03000 ... [14938.860231] [55] hci_send_cmd: hci0 opcode 0x200e plen 0 ... [14938.876427] [55] hci_le_conn_complete_evt: hci0 status 2 [14938.876433] [55] hci_conn_add: hci0 dst 00:00:00:00:00:00 [14938.876439] [55] hci_conn_init_sysfs: conn ffff88007aeff800 [14938.876454] [55] hci_send_to_control: len 14 [14938.876470] [55] l2cap_connect_cfm: hcon ffff88007aeff800 bdaddr 00:00:00:00:00:00 status 2 [14938.876474] [55] hci_conn_del: hci0 conn ffff88007aeff800 handle 0 Signed-off-by:Andrzej Kaczmarek <andrzej.kaczmarek@tieto.com> Acked-by:
-
Andrzej Kaczmarek authored
MGMT_STATUS_BUSY should be returned when LE pairing cannot be started due to another outgoing connection attempt is ongoing. Signed-off-by:
-
Andrzej Kaczmarek authored
Only one outgoing LE connection attempt should be possible. hci_connect() will now return -EBUSY in case there's another pending outgoing connection. Signed-off-by:
-
Gustavo Padovan authored
Trivial fix, let the code cleaner. Signed-off-by:
Mat Martineau <mathewm@codeaurora.org> Signed-off-by:
Johan Hedberg <johan.hedberg@intel.com>
-
Gustavo Padovan authored
Simplify the handling of different ERTM header size. We were the same check in some places of the code, and more is expected to come, so just replace them with a function. Signed-off-by:
Andrei Emeltchenko <andrei.emeltchenko@intel.com> Signed-off-by:
-
Andrei Emeltchenko authored
l2cap_att_channel always returns 0 which is not used. Signed-off-by:
-
Andrei Emeltchenko authored
l2cap_conless_channel always return 0 which is not used. Signed-off-by:
-
Andrei Emeltchenko authored
l2cap_data_channel always return 0 which is not used anywhere, make it void function. Signed-off-by:
-
Andrei Emeltchenko authored
Make A2MP channel special channel which do not reference hci_conn. This prevents from keeping ACL connection open when all L2CAP channels got closed. hci_conn_hold and hci_conn_put are not reference counts on the hci_conn structure in the typical way. They are reference counts for the ACL. When you do the last hci_conn_put, the ACL is disconnected after a timeout. Reported-by:
-
Andrei Emeltchenko authored
Functions will be always defined and in case not implemented as dummy __no_func. Signed-off-by:
-
Szymon Janc authored
Those are not used anywhere in code (and never were since introduction in 2006) so just remove them. Signed-off-by:
Szymon Janc <szymon.janc@tieto.com> Signed-off-by:
-
Andrei Emeltchenko authored
Handle incoming A2MP connection by creating AMP manager and processing A2MP messages. Signed-off-by:
-
Andrei Emeltchenko authored
A2MP fixed channel do not have sk Signed-off-by:
-
Andrei Emeltchenko authored
Process A2MP responses, print cmd code and ident for now. Signed-off-by:
-
Andrei Emeltchenko authored
Placeholder for A2MP Disconnect Physlink Request. Signed-off-by:
-
Andrei Emeltchenko authored
Placeholder for A2MP Create Physlink Request. Handles requests with invalid controler id as shown below: ... > ACL data: handle 11 flags 0x02 dlen 50 A2MP: Create Physical Link req: local id 1 remote id 85 Assoc data: <skipped> < ACL data: handle 11 flags 0x00 dlen 15 A2MP: Create Physical Link rsp: local id 85 remote id 1 status 1 Invalid Controller ID ... Signed-off-by: -
Andrei Emeltchenko authored
Example trace when receiving AMP Assoc Request with wrong AMP id. ... > ACL data: handle 11 flags 0x02 dlen 13 A2MP: Get AMP Assoc req: id 238 < ACL data: handle 11 flags 0x00 dlen 14 A2MP: Get AMP Assoc rsp: id 238 status (1) Invalid Controller ID assoc data: ... Signed-off-by: -
Andrei Emeltchenko authored
Process A2MP Get Info Request. Example of trace log for invalid controller id is shown below: ... > ACL data: handle 11 flags 0x02 dlen 13 A2MP: Get Info req: id 238 < ACL data: handle 11 flags 0x00 dlen 30 A2MP: Get Info rsp: id 238 status (1) Invalid Controller ID ... Note that If the Status field is set to Invalid Controller ID all subsequent fields in the AMP Get Info Response shall be ignored by the receiver. Signed-off-by: -
Andrei Emeltchenko authored
Placeholder for A2MP Change Notify handler. Signed-off-by:
-
Andrei Emeltchenko authored
Adds helper functions to count HCI devs and process A2MP Discover Request, code makes sure that first controller in the list is BREDR one. Trace is shown below: ... > ACL data: handle 11 flags 0x02 dlen 16 A2MP: Discover req: mtu/mps 670 mask: 0x0000 < ACL data: handle 11 flags 0x00 dlen 22 A2MP: Discover rsp: mtu/mps 670 mask: 0x0000 Controller list: id 0 type 0 (BR-EDR) status 0x01 (Bluetooth only) id 1 type 1 (802.11 AMP) status 0x01 (Bluetooth only) ... Signed-off-by: -
Andrei Emeltchenko authored
Placeholder for future A2MP Command Reject handler. Signed-off-by:
-
Andrei Emeltchenko authored
Implement basic processing for AMP Manager Protocol (A2MP). Example below shows processing unrecognized command. ... > ACL data: handle 11 flags 0x02 dlen 12 A2MP: code 0x00 ident 3 len 0 < ACL data: handle 11 flags 0x00 dlen 14 A2MP: Command Reject: reason (0) - Command not recognized ... Signed-off-by: -
Andrei Emeltchenko authored
A2MP status codes copied from Bluez patch sent by Peter Krystad <pkrystad@codeaurora.org>. Signed-off-by:
-
Andrei Emeltchenko authored
Define A2MP command IDs and packet structures. Signed-off-by:
-
Andrei Emeltchenko authored
Add L2CAP chan ops callbacks. Signed-off-by:
-
Andrei Emeltchenko authored
Helper function to build and send A2MP messages. Signed-off-by:
-
Andrei Emeltchenko authored
Define AMP Manager and some basic functions. Signed-off-by:
-
Andrei Emeltchenko authored
Create and initialize fixed A2MP channel Signed-off-by:
-
Andrei Emeltchenko authored
Signed-off-by:
-
Gustavo Padovan authored
Move this check to before the channel time creation simplifies the code and avoid memory allocation if the channel already exist. Signed-off-by:
Marcel Holtmann <marcel@holtmann.org>
-
Gustavo Padovan authored
Remove socket specific code from l2cap_core.c Signed-off-by:
-
Gustavo Padovan authored
These vars are kept in sync so we can use chan->state here. Signed-off-by:
-
Andrei Emeltchenko authored
This move socket specific code to l2cap_sock.c. Signed-off-by:
-
Andrei Emeltchenko authored
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:
-
Gustavo Padovan authored
Use chan instead of void * makes more sense here. Signed-off-by:
-
Sasha Levin authored
Commit fc50744 ("Bluetooth: Fix registering hci with duplicate name") didn't fully fix the duplicate naming issue with devices, and duplicate device names could still be created: [ 142.484097] device: 'hci1': device_add [...] [ 150.545263] device: 'hci1': device_add [ 150.550128] kobject: 'hci1' (ffff880014cc4e58): kobject_add_internal: parent: 'bluetooth', set: 'devices' [ 150.558979] ------------[ cut here ]------------ [ 150.561438] WARNING: at fs/sysfs/dir.c:529 sysfs_add_one+0xb0/0xd0() [ 150.572974] Hardware name: Bochs [ 150.580502] sysfs: cannot create duplicate filename '/devices/virtual/bluetooth/hci1' [ 150.584444] Pid: 7563, comm: trinity-child1 Tainted: G W 3.4.0-next-20120524-sasha #296 [...] Instead of the weird logic and the attempt at keeping the device list sorted, just use an IDA. Signed-off-by:Sasha Levin <levinsasha928@gmail.com> Signed-off-by:
-
Gustavo Padovan authored
This replace code in l2cap_le_conn_ready() by a similar code in l2cap_chan_ready(). Signed-off-by:
-
