linux-toradex.git/net/bluetooth/hci_conn.c, branch v3.1.8 Linux kernel for Apalis and Colibri modules Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2011-07-14T14:56:40+00:00 David S. Miller davem@davemloft.net 2011-07-14T14:56:40+00:00 6a7ebdf2fd15417e87b4fd02ff411aeaca34da5f Conflicts: net/bluetooth/l2cap_core.c 
Conflicts:
	net/bluetooth/l2cap_core.c
Bluetooth: Fix memory leak under page timeouts 2011-06-30T19:32:52+00:00 Tomas Targownik ttargownik@geicp.com 2011-06-30T19:30:44+00:00 163f4dabea4e3be485c17e8f08e3a6468ad31cbf If the remote device is not present, the connections attemp fails and the struct hci_conn was not freed Signed-off-by: Tomas Targownik <ttargownik@geicp.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi> 
If the remote device is not present, the connections attemp fails and
the struct hci_conn was not freed

Signed-off-by: Tomas Targownik <ttargownik@geicp.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6 2011-06-21T17:52:56+00:00 Gustavo F. Padovan padovan@profusion.mobi 2011-06-21T17:52:56+00:00 0555891184a5c18df0e2349872e7ecf9701fc5b5 Conflicts: net/bluetooth/l2cap_core.c 
Conflicts:
	net/bluetooth/l2cap_core.c
Bluetooth: Fix L2CAP connection establishment 2011-06-15T18:03:37+00:00 Ilia Kolomisnky ilia.kolominsky@gmail.com 2011-06-15T03:52:26+00:00 330605423ca6eafafb8dcc27502bce1c585d1b06 In hci_conn_security ( which is used during L2CAP connection establishment ) test for HCI_CONN_ENCRYPT_PEND state also sets this state, which is bogus and leads to connection time-out on L2CAP sockets in certain situations (especially when using non-ssp devices ) Signed-off-by: Ilia Kolomisnky <iliak@ti.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi> 
In hci_conn_security ( which is used during L2CAP connection
establishment ) test for HCI_CONN_ENCRYPT_PEND state also
sets this state, which is bogus and leads to connection time-out
on L2CAP sockets in certain situations (especially when
using non-ssp devices )

Signed-off-by: Ilia Kolomisnky <iliak@ti.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Bluetooth: Fix initial security level of LE links 2011-06-13T19:05:34+00:00 Vinicius Costa Gomes vinicius.gomes@openbossa.org 2011-06-09T21:50:50+00:00 7b5c0d5242295a3b52e7161bf129e2f0e8c624cb As the default security level (BT_SECURITY_SDP) doesn't make sense for LE links, initialize LE links with something that makes sense. Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@openbossa.org> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi> 
As the default security level (BT_SECURITY_SDP) doesn't make sense for
LE links, initialize LE links with something that makes sense.

Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@openbossa.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Bluetooth: Add support for LE Start Encryption 2011-06-13T18:48:25+00:00 Vinicius Costa Gomes vinicius.gomes@openbossa.org 2011-06-09T21:50:47+00:00 a7a595f675f1b33dc73167147321dba5c4395acc 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 <vinicius.gomes@openbossa.org> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi> 
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 <vinicius.gomes@openbossa.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Bluetooth: Fix L2CAP security check 2011-06-13T17:28:52+00:00 Luiz Augusto von Dentz luiz.von.dentz@intel.com 2011-06-13T12:37:35+00:00 6fdf658c9a0e51e6663f2769f6d310c2843a862b With older userspace versions (using hciops) it might not have the key type to check if the key has sufficient security for any security level so it is necessary to check the return of hci_conn_auth to make sure the connection is authenticated Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> Acked-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi> 
With older userspace versions (using hciops) it might not have the
key type to check if the key has sufficient security for any security
level so it is necessary to check the return of hci_conn_auth to make
sure the connection is authenticated

Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Acked-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Bluetooth: Simplify hci_conn_accept_secure check 2011-06-08T19:58:19+00:00 Waldemar Rymarkiewicz waldemar.rymarkiewicz@tieto.com 2011-06-02T12:24:52+00:00 ef4177e2bf92543e422fae154888062376e2283d If the link key is secure (authenticated or combination 16 digit) the sec_level will be always BT_SECURITY_HIGH. Therefore, instead of checking the link key type simply check the sec_level on the link. Signed-off-by: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi> 
If the link key is secure (authenticated or combination 16 digit)
the sec_level will be always BT_SECURITY_HIGH. Therefore, instead
of checking the link key type simply check the sec_level on the link.

Signed-off-by: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Bluetooth: Add BT_POWER L2CAP socket option. 2011-06-08T19:58:19+00:00 Jaikumar Ganesh jaikumar@google.com 2011-05-24T01:06:04+00:00 14b12d0b98f87162b7e9e93dde66d1af97886567 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 <jaikumar@google.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi> 
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 <jaikumar@google.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Bluetooth: Set 'peer_addr_type' in hci_le_connect() 2011-06-08T19:58:18+00:00 Andre Guedes andre.guedes@openbossa.org 2011-05-31T17:20:57+00:00 6d3ce0e7902314ddb330deaf8827205881d7e59f Set the 'peer_addr_type' field of the LE Create Connection command sent in hci_le_connect(). Signed-off-by: Andre Guedes <andre.guedes@openbossa.org> Acked-by: Ville Tervo <ville.tervo@nokia.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi> 
Set the 'peer_addr_type' field of the LE Create Connection command
sent in hci_le_connect().

Signed-off-by: Andre Guedes <andre.guedes@openbossa.org>
Acked-by: Ville Tervo <ville.tervo@nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>