15 Jul, 2011
1 commit
-
…wireless-next-2.6 into for-davem
Conflicts:
net/bluetooth/l2cap_core.c
11 Jul, 2011
1 commit
-
There can 3 reasons for the "command reject" reply produced
by the stack. Each such reply should be accompanied by the
relevand data ( as defined in spec. ). Currently there is one
instance of "command reject" reply with reason "invalid cid"
wich is fixed. Also, added clean-up definitions related to the
"command reject" replies.Signed-off-by: Ilia Kolomisnky
Signed-off-by: Gustavo F. Padovan
09 Jul, 2011
6 commits
-
This will be useful when userspace wants to restrict some kinds of
operations based on the length of the key size used to encrypt the
link.Signed-off-by: Vinicius Costa Gomes
Signed-off-by: Gustavo F. Padovan -
In some cases it will be useful having the key size used for
encrypting the link. For example, some profiles may restrict
some operations depending on the key length.The key size is stored in the key that is passed to userspace
using the pin_length field in the key structure.For now this field is only valid for LE controllers. 3.0+HS
controllers define the Read Encryption Key Size command, this
field is intended for storing the value returned by that
command.Signed-off-by: Vinicius Costa Gomes
Signed-off-by: Gustavo F. Padovan -
Signed-off-by: Vinicius Costa Gomes
Signed-off-by: Gustavo F. Padovan -
As the LTK (the new type of key being handled now) has more data
associated with it, we need to store this extra data and retrieve
the keys based on that data.Methods for searching for a key and for adding a new LTK are
introduced here.Signed-off-by: Vinicius Costa Gomes
Signed-off-by: Gustavo F. Padovan -
We need these changes because SMP keys may have more information
associated with them, for example, in the LTK case, it has an
encrypted diversifier (ediv) and a random number (rand).Signed-off-by: Vinicius Costa Gomes
Signed-off-by: Gustavo F. Padovan -
This adds support for generating and distributing all the keys
specified in the third phase of SMP.This will make possible to re-establish secure connections, resolve
private addresses and sign commands.For now, the values generated are random.
Signed-off-by: Vinicius Costa Gomes
Signed-off-by: Gustavo F. Padovan
08 Jul, 2011
2 commits
-
The ERTM receive buffer is now handled in a way that does not require
the busy queue and the associated polling code.Signed-off-by: Mat Martineau
Signed-off-by: Gustavo F. Padovan -
This change moves most L2CAP ERTM receive buffer handling out of the
L2CAP core and in to the socket code. It's up to the higher layer
(the socket code, in this case) to tell the core when its buffer is
full or has space available. The recv op should always accept
incoming ERTM data or else the connection will go down.Within the socket layer, an skb that does not fit in the socket
receive buffer will be temporarily stored. When the socket is read
from, that skb will be placed in the receive buffer if possible. Once
adequate buffer space becomes available, the L2CAP core is informed
and the ERTM local busy state is cleared.Receive buffer management for non-ERTM modes is unchanged.
Signed-off-by: Mat Martineau
Signed-off-by: Gustavo F. Padovan
07 Jul, 2011
4 commits
-
Since we have the extended LMP features properly implemented, we
should check the LMP_HOST_LE bit to know if the host supports LE.Signed-off-by: Andre Guedes
Signed-off-by: Gustavo F. Padovan -
This patch adds a new module parameter to enable/disable host LE
support. By default host LE support is disabled.Signed-off-by: Andre Guedes
Signed-off-by: Gustavo F. Padovan -
This patch adds a handler to Write LE Host Supported command complete
events. Once this commands has completed successfully, we should
read the extended LMP features and update the extfeatures field in
hci_dev.Signed-off-by: Andre Guedes
Signed-off-by: Gustavo F. Padovan -
This new field holds the extended LMP features value. Some LE
mechanism such as discovery procedure needs to read the extended
LMP features to work properly.Signed-off-by: Andre Guedes
Signed-off-by: Gustavo F. Padovan
02 Jul, 2011
1 commit
-
priv and lock are never used
Signed-off-by: Gustavo F. Padovan
01 Jul, 2011
2 commits
-
Add a local logging function to emit bluetooth specific
messages. Using vsprintf extension %pV saves code/text
space.Convert the current BT_INFO and BT_ERR macros to use bt_printk.
Remove __func__ from BT_ERR macro (and the uses).
Prefix "Bluetooth: " to BT_ERR
Remove __func__ from BT_DBG as function can be prefixed when
using dynamic_debug.With allyesconfig:
text data bss dec hex filename
129956 8632 36096 174684 2aa5c drivers/bluetooth/built-in.o.new2
134402 8632 36064 179098 2bb9a drivers/bluetooth/built-in.o.old
14778 1012 3408 19198 4afe net/bluetooth/bnep/built-in.o.new2
15067 1012 3408 19487 4c1f net/bluetooth/bnep/built-in.o.old
346595 19163 86080 451838 6e4fe net/bluetooth/built-in.o.new2
353751 19163 86064 458978 700e2 net/bluetooth/built-in.o.old
18483 1172 4264 23919 5d6f net/bluetooth/cmtp/built-in.o.new2
18927 1172 4264 24363 5f2b net/bluetooth/cmtp/built-in.o.old
19237 1172 5152 25561 63d9 net/bluetooth/hidp/built-in.o.new2
19581 1172 5152 25905 6531 net/bluetooth/hidp/built-in.o.old
59461 3884 14464 77809 12ff1 net/bluetooth/rfcomm/built-in.o.new2
61206 3884 14464 79554 136c2 net/bluetooth/rfcomm/built-in.o.oldwith x86 defconfig (and just bluetooth):
$ size net/bluetooth/built-in.o.defconfig.*
text data bss dec hex filename
66358 933 100 67391 1073f net/bluetooth/built-in.o.defconfig.new
66643 933 100 67676 1085c net/bluetooth/built-in.o.defconfig.oldSigned-off-by: Joe Perches
Signed-off-by: Gustavo F. Padovan -
Make it easier to use more normal logging styles later.
Signed-off-by: Joe Perches
Signed-off-by: Gustavo F. Padovan
25 Jun, 2011
1 commit
-
…wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/rtlwifi/pci.c
include/linux/netlink.h
17 Jun, 2011
4 commits
-
Instead of setting bits manually we use set_bit, test_bit, etc.
Also remove L2CAP_ prefix from macros.Signed-off-by: Gustavo F. Padovan
-
Instead of making the bit operations manually, we now use set_bit,
test_bit, etc.Signed-off-by: Gustavo F. Padovan
-
Management interface commands for blocking and unblocking devices.
Signed-off-by: Antti Julku
Signed-off-by: Gustavo F. Padovan -
Move blacklisting functions to hci_core.c, so that they can
be used by both management interface and hci socket interface.Signed-off-by: Antti Julku
Signed-off-by: Gustavo F. Padovan
15 Jun, 2011
2 commits
-
This patch implements a check in smp cmd pairing request and pairing
response to verify if encryption key maximum size is compatible in both
slave and master when SMP Pairing is requested. Keys are also masked to
the correct negotiated size.Signed-off-by: Vinicius Costa Gomes
Signed-off-by: Anderson Briglia
Signed-off-by: Gustavo F. Padovan -
This patch adds support for disconnecting the link when SMP procedure
takes more than 30 seconds.SMP begins when either the Pairing Request command is sent or the
Pairing Response is received, and it ends when the link is encrypted
(or terminated). Vol 3, Part H Section 3.4.Signed-off-by: Vinicius Costa Gomes
Signed-off-by: Gustavo F. Padovan
14 Jun, 2011
14 commits
-
If the pending security level is greater than the current security
level and the link is now encrypted, we should update the link
security level.This is only useful for LE links, when the only event generated
when SMP is sucessful in the Encrypt Change event.Signed-off-by: Vinicius Costa Gomes
Signed-off-by: Gustavo F. Padovan -
This adds support for starting SMP Phase 2 Encryption, when the initial
SMP negotiation is successful. This adds the LE Start Encryption and LE
Long Term Key Request commands and related events.Signed-off-by: Vinicius Costa Gomes
Signed-off-by: Gustavo F. Padovan -
This patch includes support for generating and sending the random value
used to produce the confirmation value.Signed-off-by: Anderson Briglia
Signed-off-by: Vinicius Costa Gomes
Signed-off-by: Gustavo F. Padovan -
This patch adds initial support for verifying the confirmation value
that the remote side has sent.Signed-off-by: Anderson Briglia
Signed-off-by: Vinicius Costa Gomes
Signed-off-by: Gustavo F. Padovan -
This will allow using the crypto subsystem for encrypting data. As SMP
(Security Manager Protocol) is implemented almost entirely on the host
side and the crypto module already implements the needed methods
(AES-128), it makes sense to use it.There's now a new module option to enable/disable SMP support.
Signed-off-by: Vinicius Costa Gomes
Signed-off-by: Anderson Briglia
Signed-off-by: Gustavo F. Padovan -
This implementation only exchanges SMP messages between the Host and the
Remote. No keys are being generated. TK and STK generation will be
provided in further patches.Signed-off-by: Vinicius Costa Gomes
Signed-off-by: Gustavo F. Padovan -
These simple commands will allow the SMP procedure to be started
and terminated with a not supported error. This is the first step
toward something useful.Signed-off-by: Vinicius Costa Gomes
Signed-off-by: Anderson Briglia
Signed-off-by: Gustavo F. Padovan -
ERTM use the generic L2CAP timer functions to keep a reference to the
channel. This is useful for avoiding crashes.Signed-off-by: Gustavo F. Padovan
-
We now plan to use l2cap_set_timer and l2cap_clear_timer in ERTM timers.
Signed-off-by: Gustavo F. Padovan
-
struct l2cap_chan has now its own refcnt that is compatible with the
socket refcnt, i.e., we won't see sk_refcnt = 0 and chan->refcnt > 0.Signed-off-by: Gustavo F. Padovan
-
Now socket state is tracked by struct sock and channel state is tracked by
chan->state. At this point both says the same, but this is going to change
when we add AMP Support for example.Signed-off-by: Gustavo F. Padovan
-
close() calls l2cap_sock_kill() on l2cap_sock.c
Signed-off-by: Gustavo F. Padovan
-
This abstracts the call to sock_queue_recv_skb() into
l2cap_chan_ops->recv().Signed-off-by: Gustavo F. Padovan
-
Add an abstraction layer between L2CAP core and its users (only
l2cap_sock.c now). The first function implemented is new_connection() that
replaces calls to l2cap_sock_alloc() in l2cap_core.cSigned-off-by: Gustavo F. Padovan
10 Jun, 2011
1 commit
-
Fix lines longer than 80 chars in length.
Signed-off-by: Waldemar Rymarkiewicz
Signed-off-by: Gustavo F. Padovan
09 Jun, 2011
1 commit
-
Add BT_POWER socket option used to control the power
characteristics of the underlying ACL link. When the remote end
has put the link in sniff mode and the host stack wants to send
data we need need to explicitly exit sniff mode to work well with
certain devices (For example, A2DP on Plantronics Voyager 855).
However, this causes problems with HID devices.Hence, moving into active mode when sending data, irrespective
of who set the sniff mode has been made as a socket option. By
default, we will move into active mode. HID devices can set the
L2CAP socket option to prevent this from happening.Currently, this has been implemented for L2CAP sockets. This has been
tested with incoming and outgoing L2CAP sockets for HID and A2DP.Based on discussions on linux-bluetooth and patches submitted by
Andrei Emeltchenko.Signed-off-by: Jaikumar Ganesh
Signed-off-by: Gustavo F. Padovan
