snowball/igloo-kernel.git/net/bluetooth, branch integration-linux-ux500

Merge Linaro Android branch ' jstultz/linaro-android-3.4

2012-06-04T11:46:24+00:00

' into integration-android-ux500 Signed-off-by: Philippe Langlais

Bluetooth: Set up correct eSCO packet type for incomming connection

2012-05-22T09:07:33+00:00

This patch sets up correct eSCO packet type mask for the incomming connection request. ST-Ericsson ID: 413660 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ice423fe276c184d7350c4940efe1e010f5c3751d Signed-off-by: Sebastian Chlad Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/48491 Reviewed-by: QABUILD Reviewed-by: QATEST Reviewed-by: Jonas ABERG Reviewed-by: Sebastian CHLAD Tested-by: Sebastian CHLAD Reviewed-by: Anurag GUPTA-1

BT: Add sec_level to auth_conn_info

2012-05-22T09:07:33+00:00

With this patch it is possible to retrieve sec_level from the kernel by user space. This is needed for SAP working on hciops. This patch missed to be added when moving to kernel 3.0 ST-Ericsson ID: 256270 ST-Ericsson FOSS-OUT ID: FOSS-OUT-10060 Change-Id: Ic569db392e6f6ee2e546003dec86cc2d62a1fcd7 Signed-off-by: Lukasz Rymanowski Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/42169 Reviewed-by: Lukasz RYMANOWSKI Tested-by: Lukasz RYMANOWSKI Reviewed-by: Hakan GARDRUP Reviewed-by: Henrik POSSUNG Reviewed-by: Kanak GUPTA

bluetooth: Add SCO parameters support for socket

2012-05-22T09:07:32+00:00

Adds ability to setup SCO connection parameters through socket option. ST-Ericsson Linux next: Not tested, ER 256277 ST-Ericsson ID: 256277 ST-Ericsson FOSS-OUT ID: STETL-FOSS-OUT-10137 Change-Id: If859341019fd9f7cc7c0efe95750779e84fac801 Signed-off-by: Andrzej Kaczmarek Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30136 Reviewed-by: Par-Gunnar HJALMDAHL Tested-by: Par-Gunnar HJALMDAHL Reviewed-by: Srinidhi KASAGAR Signed-off-by: Robert Marklund

bluetooth: Improve BNEP extension headers handling

2012-05-22T09:07:32+00:00

Adds handling of extension headers to BNEP control packets. Adds support for BNEP setup connection request handled in pand. ST-Ericsson Linux next: - ST-Ericsson ID: 328144 ST-Ericsson FOSS-OUT-ID: Trivial Depends-On: Id2cbd106af9b380f63d87ea0b4652ec6cd996fa4 Change-Id: I005e00e2fe934dc19f40533953d5b233676f0d0e Signed-off-by: Andrzej Kaczmarek Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/18117 Reviewed-by: Par-Gunnar HJALMDAHL Reviewed-by: Lukasz RYMANOWSKI Reviewed-by: Henrik POSSUNG

Bluetooth: mgmt: Fix device_connected sending order

2012-05-14T17:56:15+00:00

The mgmt_ev_device_connected signal must be sent before any event indications happen for sockets associated with the connection. Otherwise e.g. device authorization for the sockets will fail with ENOTCONN as user space things that there is no baseband link. This patch fixes the issue by ensuring that the device_connected event if sent (if it hasn't been so already) as soon as the first ACL data packet arrives from the remote device. Signed-off-by: Johan Hedberg Acked-by: Marcel Holtmann Signed-off-by: John W. Linville

Bluetooth: notify userspace of security level change

2012-05-14T17:51:25+00:00

It fixes L2CAP socket based security level elevation during a connection. The HID profile needs this (for keyboards) and it is the only way to achieve the security level elevation when using the management interface to talk to the kernel (hence the management enabling patch being the one that exposes this issue). It enables the userspace a security level change when the socket is already connected and create a way to notify the socket the result of the request. At the moment of the request the socket is made non writable, if the request fails the connections closes, otherwise the socket is made writable again, POLL_OUT is emmited. Signed-off-by: Gustavo Padovan Acked-by: Marcel Holtmann Signed-off-by: Johan Hedberg Signed-off-by: John W. Linville

Merge commit 'v3.4-rc6' into android-3.4

2012-05-08T01:20:34+00:00

Conflicts: arch/arm/mm/cache-l2x0.c arch/arm/mm/mmu.c Change-Id: If4f371a21c052fa597d107c44b128a093e4a8b91

Revert Bluetooth: Use the stored LTK for restabilishing security

2012-05-08T01:17:15+00:00

This patch reverts commit b7d6cd72ce713a256406d47e798ea4797404d81e. This patch was already applied upstream and then modified, then was accidentally applied again to the android-3.4 tree. Change-Id: I0c5a822f3f2a5b75564eeeb2598f13b7a149c58d Reported-by: Andrey Konovalov Signed-off-by: John Stultz

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth

2012-04-27T19:16:43+00:00