Andrzej Kaczmarek
dfc94dbdb9
Bluetooth: Allow only one LE connection attempt
...
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: Andrzej Kaczmarek <andrzej.kaczmarek@tieto.com >
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
2012-06-05 06:34:15 +03:00
Gustavo Padovan
f0f6279976
Bluetooth: Remove unused err var from l2cap_segment_sdu()
...
Trivial fix, let the code cleaner.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
Reviewed-by: Mat Martineau <mathewm@codeaurora.org >
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com >
2012-06-05 06:34:15 +03:00
Gustavo Padovan
ba7aa64fe2
Bluetooth: Create function to return the ERTM header size
...
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: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
Acked-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com >
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com >
2012-06-05 06:34:15 +03:00
Andrei Emeltchenko
6810fca724
Bluetooth: Make l2cap_att_channel return void
...
l2cap_att_channel always returns 0 which is not used.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com >
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
2012-06-05 06:34:14 +03:00
Andrei Emeltchenko
84104b241d
Bluetooth: Make l2cap_conless_channel return void
...
l2cap_conless_channel always return 0 which is not used.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com >
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
2012-06-05 06:34:14 +03:00
Andrei Emeltchenko
13ca56e053
Bluetooth: Make l2cap_data_channel return void
...
l2cap_data_channel always return 0 which is not used anywhere,
make it void function.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com >
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
2012-06-05 06:34:14 +03:00
Andrei Emeltchenko
3cabbfdad3
Bluetooth: A2MP: Do not reference hci_conn
...
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: Mat Martineau <mathewm@codeaurora.org >
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com >
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
2012-06-05 06:34:14 +03:00
Andrei Emeltchenko
fd83e2c27c
Bluetooth: Do not check func ready existence
...
Functions will be always defined and in case not implemented as
dummy __no_func.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com >
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
2012-06-05 06:34:14 +03:00
Andrei Emeltchenko
97e8e89d2d
Bluetooth: A2MP: Manage incoming connections
...
Handle incoming A2MP connection by creating AMP manager and
processing A2MP messages.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com >
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
2012-06-05 06:34:14 +03:00
Andrei Emeltchenko
416fa7527d
Bluetooth: A2MP: Handling fixed channels
...
A2MP fixed channel do not have sk
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com >
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
2012-06-05 06:34:13 +03:00
Andrei Emeltchenko
f6410a849b
Bluetooth: A2MP: Process A2MP Command Responses
...
Process A2MP responses, print cmd code and ident for now.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com >
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
2012-06-05 06:34:13 +03:00
Andrei Emeltchenko
6113f84fc1
Bluetooth: A2MP: Process A2MP Disc Physlink Request
...
Placeholder for A2MP Disconnect Physlink Request.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com >
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
2012-06-05 06:34:13 +03:00
Andrei Emeltchenko
e072f5dab2
Bluetooth: A2MP: Process A2MP Create Physlink Request
...
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 <andrei.emeltchenko@intel.com >
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
2012-06-05 06:34:13 +03:00
Andrei Emeltchenko
a28381dc9c
Bluetooth: A2MP: Process A2MP Get AMP Assoc Request
...
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 <andrei.emeltchenko@intel.com >
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
2012-06-05 06:34:13 +03:00
Andrei Emeltchenko
47f2d97d38
Bluetooth: A2MP: Process A2MP Get Info Request
...
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 <andrei.emeltchenko@intel.com >
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
2012-06-05 06:34:13 +03:00
Andrei Emeltchenko
329d81af29
Bluetooth: A2MP: Process A2MP Change Notify
...
Placeholder for A2MP Change Notify handler.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com >
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
2012-06-05 06:34:13 +03:00
Andrei Emeltchenko
8598d064cb
Bluetooth: A2MP: Process A2MP Discover Request
...
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 <andrei.emeltchenko@intel.com >
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
2012-06-05 06:34:12 +03:00
Andrei Emeltchenko
21dbd2ce35
Bluetooth: A2MP: Process A2MP Command Reject
...
Placeholder for future A2MP Command Reject handler.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com >
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
2012-06-05 06:34:12 +03:00
Andrei Emeltchenko
6b44d9b8d9
Bluetooth: A2MP: Process A2MP messages
...
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 <andrei.emeltchenko@intel.com >
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
2012-06-05 06:34:12 +03:00
Andrei Emeltchenko
46d5c9088f
Bluetooth: A2MP: Add chan callbacks
...
Add L2CAP chan ops callbacks.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com >
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
2012-06-05 06:34:12 +03:00
Andrei Emeltchenko
f6d3c6e783
Bluetooth: A2MP: Build and Send msg helpers
...
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 >
2012-06-05 06:34:12 +03:00
Andrei Emeltchenko
9740e49d17
Bluetooth: A2MP: AMP Manager basic functions
...
Define AMP Manager and some basic functions.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com >
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
2012-06-05 06:34:11 +03:00
Andrei Emeltchenko
466f8004f3
Bluetooth: A2MP: Create A2MP channel
...
Create and initialize fixed A2MP channel
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com >
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
2012-06-05 06:34:11 +03:00
Andrei Emeltchenko
0181a70f54
Bluetooth: trivial: Use defined PSMLEN instead of magic
...
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com >
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
2012-06-05 06:34:11 +03:00
Gustavo Padovan
2dfa1003cc
Bluetooth: check for already existent channel before create new one
...
Move this check to before the channel time creation simplifies the code
and avoid memory allocation if the channel already exist.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
Acked-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com >
Signed-off-by: Marcel Holtmann <marcel@holtmann.org >
2012-06-05 06:34:11 +03:00
Gustavo Padovan
538266929e
Bluetooth: Move check for backlog size to l2cap_sock.c
...
Remove socket specific code from l2cap_core.c
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
Acked-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com >
Signed-off-by: Marcel Holtmann <marcel@holtmann.org >
2012-06-05 06:34:11 +03:00
Gustavo Padovan
0797e01d87
Bluetooth: Use chan->state instead of sk->sk_state
...
These vars are kept in sync so we can use chan->state here.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
Signed-off-by: Marcel Holtmann <marcel@holtmann.org >
2012-06-05 06:34:11 +03:00
Andrei Emeltchenko
54a59aa2b5
Bluetooth: Add l2cap_chan->ops->ready()
...
This move socket specific code to l2cap_sock.c.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com >
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
Signed-off-by: Marcel Holtmann <marcel@holtmann.org >
2012-06-05 06:34:11 +03:00
Andrei Emeltchenko
c0df7f6e06
Bluetooth: Move clean up code and set of SOCK_ZAPPED to l2cap_sock.c
...
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: Andrei Emeltchenko <andrei.emeltchenko@intel.com >
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
Signed-off-by: Marcel Holtmann <marcel@holtmann.org >
2012-06-05 06:34:10 +03:00
Gustavo Padovan
80b9802795
Bluetooth: Use chan as parameters for l2cap chan ops
...
Use chan instead of void * makes more sense here.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
Signed-off-by: Marcel Holtmann <marcel@holtmann.org >
2012-06-05 06:34:10 +03:00
Sasha Levin
3df92b31b2
Bluetooth: Really fix registering hci with duplicate name
...
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: Marcel Holtmann <marcel@holtmann.org >
2012-06-05 06:34:10 +03:00
Gustavo Padovan
6754e0df13
Bluetooth: Use l2cap_chan_ready() in LE path
...
This replace code in l2cap_le_conn_ready() by a similar code in
l2cap_chan_ready().
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
Signed-off-by: Marcel Holtmann <marcel@holtmann.org >
2012-06-05 06:34:10 +03:00
Gustavo Padovan
2f84a2e6a6
Bluetooth: Remove extra l2cap_state_change(BT_CONNECTED)
...
This is already performed inside l2cap_chan_ready(), so we don't need it
here again.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
Acked-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com >
Signed-off-by: Marcel Holtmann <marcel@holtmann.org >
2012-06-05 06:34:10 +03:00
Gustavo Padovan
35d401df3d
Bluetooth: Get a more accurate L2CAP PDU len
...
Both FCS and Extended header might be or might not be present in a ERTM
channel.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
Reviewed-by: Mat Martineau <mathewm@codeaurora.org >
Signed-off-by: Marcel Holtmann <marcel@holtmann.org >
2012-06-05 06:34:09 +03:00
Andrei Emeltchenko
82781e634f
Bluetooth: Use __constant modifier in HCI code
...
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com >
Signed-off-by: Marcel Holtmann <marcel@holtmann.org >
2012-06-05 06:34:09 +03:00
Andrei Emeltchenko
ac73498cbb
Bluetooth: Use __constant when dealing with constants
...
__constant_cpu_to_le16() is the right go here.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com >
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
2012-06-05 06:34:09 +03:00
Andrei Emeltchenko
2983fd6824
Bluetooth: Define and use PSM identifiers
...
Define assigned Protocol and Service Multiplexor (PSM) identifiers
and use them instead of magic numbers.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com >
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
2012-06-05 06:34:09 +03:00
Gustavo Padovan
6d3c730f03
Bluetooth: Use lmp_ssp_capable() macro
...
Make the check more user friendly.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
Signed-off-by: Marcel Holtmann <marcel@holtmann.org >
2012-06-05 06:34:09 +03:00
Mat Martineau
2d369359f1
Bluetooth: Send a configuration request after security confirmation
...
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: Mat Martineau <mathewm@codeaurora.org >
Signed-off-by: Marcel Holtmann <marcel@holtmann.org >
2012-06-05 06:34:08 +03:00
Andrei Emeltchenko
59e54bd15d
Bluetooth: Define L2CAP conf continuation flag
...
Define Continuation flag which the only flag used from Flags field
in L2CAP Configuration Request and Response.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com >
Signed-off-by: Marcel Holtmann <marcel@holtmann.org >
2012-06-05 06:34:08 +03:00
Gustavo Padovan
8449e381a8
Bluetooth: Remove unneeded EXPORT_SYMBOL
...
After l2cap, sco and bluetooth modules merge some symbols doesn't need to
be exported anymore.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
Signed-off-by: Marcel Holtmann <marcel@holtmann.org >
2012-06-05 06:34:08 +03:00
Gustavo Padovan
8c520a5992
Bluetooth: Remove unnecessary headers include
...
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 <gustavo.padovan@collabora.co.uk >
Signed-off-by: Marcel Holtmann <marcel@holtmann.org >
2012-06-05 06:34:08 +03:00
Gustavo Padovan
8fc9ced398
Bluetooth: Fix coding style in the subsystem
...
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 <gustavo.padovan@collabora.co.uk >
Signed-off-by: Marcel Holtmann <marcel@holtmann.org >
2012-06-05 06:34:08 +03:00
Gustavo Padovan
fc5fef615a
Bluetooth: Remove 'register' usage from the subsystem
...
Let the compiler chooses what is best.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
Signed-off-by: Marcel Holtmann <marcel@holtmann.org >
2012-06-05 06:34:07 +03:00
Gustavo Padovan
6039aa73a1
Bluetooth: Remove most of the inline usage
...
Only obvious cases were left as inline, mostly oneline functions.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
Signed-off-by: Marcel Holtmann <marcel@holtmann.org >
2012-06-05 06:34:07 +03:00
Andrei Emeltchenko
4f42a8cd49
Bluetooth: trivial: Remove empty line
...
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com >
Signed-off-by: Marcel Holtmann <marcel@holtmann.org >
2012-06-05 06:34:07 +03:00
Andrei Emeltchenko
5325e5bb86
Bluetooth: Preserve L2CAP flags values
...
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 <andrei.emeltchenko@intel.com >
Signed-off-by: Marcel Holtmann <marcel@holtmann.org >
2012-06-05 06:34:07 +03:00
Andrei Emeltchenko
9b3b44604a
Bluetooth: Use defined link key size
...
Remove magic number with defined link key size.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com >
Signed-off-by: Marcel Holtmann <marcel@holtmann.org >
2012-06-05 06:34:06 +03:00
Szymon Janc
a6c511c636
Bluetooth: Rename HCI_QUIRK_NO_RESET to HCI_QUIRK_RESET_ON_CLOSE
...
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: Marcel Holtmann <marcel@holtmann.org >
2012-06-05 06:34:06 +03:00
Gustavo Padovan
d660366d53
Bluetooth: Remove dead int returns
...
These functions were returning always 0, we just make then void.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk >
Reviewed-by: Mat Martineau <mathewm@codeaurora.org >
Signed-off-by: Marcel Holtmann <marcel@holtmann.org >
2012-06-05 06:34:06 +03:00