- 05 Jun, 2012 40 commits
-
-
Andrei Emeltchenko authored
Helper function to build and send A2MP messages. Signed-off-by:
Andrei Emeltchenko <andrei.emeltchenko@intel.com> Signed-off-by:
Gustavo Padovan <gustavo.padovan@collabora.co.uk>
-
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:
Mat Martineau <mathewm@codeaurora.org> Signed-off-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:
-
Gustavo Padovan authored
This is already performed inside l2cap_chan_ready(), so we don't need it here again. Signed-off-by:
-
Gustavo Padovan authored
Both FCS and Extended header might be or might not be present in a ERTM channel. Signed-off-by:
-
Andrei Emeltchenko authored
Add HCI commands to deal with Bluetooth AMP controllers. Those commands will be used by bluetooth and softamp code. Signed-off-by:
-
Andrei Emeltchenko authored
Signed-off-by:
-
Andrei Emeltchenko authored
__constant_cpu_to_le16() is the right go here. Signed-off-by:
-
Andrei Emeltchenko authored
Define assigned Protocol and Service Multiplexor (PSM) identifiers and use them instead of magic numbers. Signed-off-by:
-
Gustavo Padovan authored
Make the check more user friendly. Signed-off-by:
-
Bing Zhao authored
SD8787 SDIO function 3 (device ID 0x911B) is for Bluetooth AMP. Signed-off-by:
Bing Zhao <bzhao@marvell.com> Signed-off-by:
-
Mat Martineau authored
Sometimes an ACL link must be raised to a higher security level after an L2CAP connection is requested, but before a connection response is sent. In this case, a connection response sent by L2CAP was not immediately followed by a configuration request. Other code paths do send this configuration request right away. It was possible for the connection to stall while L2CAP waited for the remote device (like PTS) to trigger the configuration process. Here is an abbreviated hcidump of the failure case with PTS: 1337806446.051982 > ACL data: handle 43 flags 0x02 dlen 10 L2CAP(s): Info req: type 2 1337806446.052050 < ACL data: handle 43 flags 0x00 dlen 16 L2CAP(s): Info rsp: type 2 result 0 Extended feature mask 0x000000b8 1337806446.595320 > ACL data: handle 43 flags 0x02 dlen 12 L2CAP(s): Connect req: psm 4097 scid 0x0041 1337806446.595673 < ACL data: handle 43 flags 0x00 dlen 16 L2CAP(s): Connect rsp: dcid 0x0040 scid 0x0041 result 1 status 0 1337806446.595679 < ACL data: handle 43 flags 0x00 dlen 10 L2CAP(s): Info req: type 2 1337806446.669835 > ACL data: handle 43 flags 0x02 dlen 16 L2CAP(s): Info rsp: type 2 result 0 Extended feature mask 0x00000028 1337806446.669899 < HCI Command: Authentication Requested (0x01|0x0011) plen 2 1337806446.669906 < ACL data: handle 43 flags 0x00 dlen 16 L2CAP(s): Connect rsp: dcid 0x0040 scid 0x0041 result 1 status 1 <security setup here> 1337806446.769888 < ACL data: handle 43 flags 0x00 dlen 16 L2CAP(s): Connect rsp: dcid 0x0040 scid 0x0041 result 0 status 0 At this point, the connection stalls and no further messages are sent on the L2CAP signaling channel. No data is received either. If we immediately send a configuration request after a successful connect response, the connection completes: 1337724090.041162 > ACL data: handle 43 flags 0x02 dlen 10 L2CAP(s): Info req: type 2 1337724090.041236 < ACL data: handle 43 flags 0x00 dlen 16 L2CAP(s): Info rsp: type 2 result 0 Extended feature mask 0x000000b8 1337724090.597128 > ACL data: handle 43 flags 0x02 dlen 12 L2CAP(s): Connect req: psm 4097 scid 0x0041 1337724090.597236 < ACL data: handle 43 flags 0x00 dlen 16 L2CAP(s): Connect rsp: dcid 0x0040 scid 0x0041 result 1 status 0 1337724090.597244 < ACL data: handle 43 flags 0x00 dlen 10 L2CAP(s): Info req: type 2 1337724090.660842 > ACL data: handle 43 flags 0x02 dlen 16 L2CAP(s): Info rsp: type 2 result 0 Extended feature mask 0x00000028 1337724090.660926 < HCI Command: Authentication Requested (0x01|0x0011) plen 2 1337724090.660934 < ACL data: handle 43 flags 0x00 dlen 16 L2CAP(s): Connect rsp: dcid 0x0040 scid 0x0041 result 1 status 1 <security setup here> 1337724090.755162 < ACL data: handle 43 flags 0x00 dlen 16 L2CAP(s): Connect rsp: dcid 0x0040 scid 0x0041 result 0 status 0 1337724090.755171 < ACL data: handle 43 flags 0x00 dlen 23 L2CAP(s): Config req: dcid 0x0041 flags 0x00 clen 11 1337724091.361847 > ACL data: handle 43 flags 0x02 dlen 29 L2CAP(s): Config rsp: scid 0x0040 flags 0x00 result 0 clen 15 1337724091.863808 > ACL data: handle 43 flags 0x02 dlen 23 L2CAP(s): Config req: dcid 0x0040 flags 0x00 clen 11 1337724091.863882 < ACL data: handle 43 flags 0x00 dlen 29 L2CAP(s): Config rsp: scid 0x0041 flags 0x00 result 0 clen 15 1337724092.683745 > ACL data: handle 43 flags 0x02 dlen 12 L2CAP(d): cid 0x0040 len 8 [psm 4097] 0000: 00 00 11 22 33 44 34 2f ..."3D4/ Signed-off-by: -
Andrei Emeltchenko authored
Define Continuation flag which the only flag used from Flags field in L2CAP Configuration Request and Response. Signed-off-by:
-
Gustavo Padovan authored
After l2cap, sco and bluetooth modules merge some symbols doesn't need to be exported anymore. Signed-off-by:
-
Gustavo Padovan authored
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 authored
This is some leftover from the last patches that fixed style. It is mostly line over 80 characters fixes reported by checkpatch.pl. checkpatch.pl is clean for these files now. Signed-off-by:
-
Gustavo Padovan authored
Fix all warning and errors reported by checkpatch but license trailing whitespace and bdaddr_t definition. Signed-off-by:
-
Gustavo Padovan authored
Let the compiler chooses what is best. Signed-off-by:
-
Gustavo Padovan authored
Only obvious cases were left as inline, mostly oneline functions. Signed-off-by:
-
Andrei Emeltchenko authored
Signed-off-by:
-
Andrei Emeltchenko authored
Previous callers of l2cap_build_conf_rsp in l2cap_config_req use flags instead of continuation flag hardcoded value. It does not change logic and preserve future possible flags. Signed-off-by:
-
Andrei Emeltchenko authored
Remove magic number with defined link key size. Signed-off-by:
-
Szymon Janc authored
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 <szymon.janc@tieto.com> Signed-off-by:
-
Gustavo Padovan authored
As reported by checkpatch.pl Signed-off-by:
-
Gustavo Padovan authored
These functions were returning always 0, we just make then void. Signed-off-by:
-
Gustavo Padovan authored
The same check is done just before call l2cap_streaming_send() Signed-off-by:
-
Andrei Emeltchenko authored
Silence warnings below: net/bluetooth/l2cap_core.c:1662:24: warning: Using plain integer as NULL pointer net/bluetooth/l2cap_core.c:1662:27: warning: Using plain integer as NULL pointer net/bluetooth/l2cap_core.c:1683:24: warning: Using plain integer as NULL pointer net/bluetooth/l2cap_core.c:1683:27: warning: Using plain integer as NULL pointer net/bluetooth/l2cap_core.c:2260:46: warning: Using plain integer as NULL pointer net/bluetooth/l2cap_core.c:2574:33: warning: Using plain integer as NULL pointer net/bluetooth/l2cap_core.c:2581:33: warning: Using plain integer as NULL pointer net/bluetooth/l2cap_core.c:4556:24: warning: Using plain integer as NULL pointer net/bluetooth/l2cap_core.c:4556:27: warning: Using plain integer as NULL pointer Signed-off-by:
-
Gustavo Padovan authored
chan->tx_q is only initialized if we use ERTM or Streaming mode. Signed-off-by:
-
Mat Martineau authored
This enables the new receive and transmit state machines. Signed-off-by:
-
Mat Martineau authored
Now that l2cap_ctrl is used to set up control fields, these macros are not needed. Signed-off-by:
-
Mat Martineau authored
The transmit window values must be configured for streaming mode, even though streaming mode does not have a window. This enables use of extended headers when the transmit window socket option is set to 64 or larger. Signed-off-by:
-
