linux.git/include/net/bluetooth, branch v3.3-rc5

bluetooth: hci: Fix type of "enable_hs" to bool.

2012-01-22T20:08:46+00:00

Fixes:

net/bluetooth/hci_core.c: In function ‘__check_enable_hs’:
net/bluetooth/hci_core.c:2587:1: warning: return from incompatible pointer type [enabled by default]

Signed-off-by: David S. Miller

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next

2012-01-10T20:44:17+00:00

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

2012-01-03T20:16:34+00:00

Conflicts:
	drivers/net/wireless/b43/dma.c
	drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c

Bluetooth: Rename extfeatures

2012-01-03T00:21:05+00:00

This patch renames hdev->extfeatures to hdev->host_features since it
holds the extended features Page 1 (aka host features).

Signed-off-by: Andre Guedes 
Acked-by: Marcel Holtmann 
Signed-off-by: Gustavo F. Padovan

Bluetooth: remove *_bh usage from hci_dev_list and hci_cb_list

2011-12-22T20:06:24+00:00

They don't need to disable interrupts anymore, we only run in process
context now.

Acked-by: Marcel Holtmann 
Signed-off-by: Gustavo F. Padovan

Bluetooth: Remove lock from inquiry_cache

2011-12-22T20:02:06+00:00

It was never used, so removing it.

Acked-by: Marcel Holtmann 
Signed-off-by: Gustavo F. Padovan

Bluetooth: Add MITM mechanism to LE-SMP

2011-12-22T16:18:59+00:00

To achive Man-In-The-Middle (MITM) level security with Low Energy,
we have to enable User Passkey Comparison.  This commit modifies the
hard-coded JUST-WORKS pairing mechanism to support query via the MGMT
interface of Passkey comparison and User Confirmation.

Signed-off-by: Brian Gix 
Acked-by: Marcel Holtmann
Signed-off-by: Gustavo F. Padovan

Bluetooth: Fix deadlocks with sock lock and L2CAP timers locks

2011-12-22T16:15:09+00:00

When cancelling a delayed work (timer) in L2CAP we can not sleep holding
the sock mutex otherwise we might deadlock with an L2CAP timer handler.
This is possible because RX/TX and L2CAP timers run in different workqueues.
The scenario below illustrates the problem. Thus we are now avoiding to
sleep on the timers locks.

 ======================================================
 [ INFO: possible circular locking dependency detected ]
 3.1.0-05270-ga978dc7-dirty #239
 -------------------------------------------------------
 kworker/1:1/873 is trying to acquire lock:
  (sk_lock-AF_BLUETOOTH-BTPROTO_L2CAP){+.+...}, at: [] l2cap_chan_timeout+0x3c/0xe0 [bluetooth]

 but task is already holding lock:
  ((&(&chan->chan_timer)->work)){+.+...}, at: [] process_one_work+0x126/0x450

 which lock already depends on the new lock.

 the existing dependency chain (in reverse order) is:

 -> #1 ((&(&chan->chan_timer)->work)){+.+...}:
        [] check_prevs_add+0xf6/0x170
        [] validate_chain+0x613/0x790
        [] __lock_acquire+0x4be/0xac0
        [] lock_acquire+0x8d/0xb0
        [] wait_on_work+0x4f/0x160
        [] __cancel_work_timer+0x73/0x80
        [] cancel_delayed_work_sync+0xd/0x10
        [] l2cap_chan_connect+0x22d/0x470 [bluetooth]
        [] l2cap_sock_connect+0xb1/0x140 [bluetooth]
        [] kernel_connect+0xb/0x10
        [] rfcomm_session_create+0x12a/0x1c0 [rfcomm]
        [] __rfcomm_dlc_open+0x1c7/0x240 [rfcomm]
        [] rfcomm_dlc_open+0x42/0x70 [rfcomm]
        [] rfcomm_sock_connect+0x103/0x150 [rfcomm]
        [] sys_connect+0xae/0xc0
        [] compat_sys_socketcall+0xb2/0x220
        [] sysenter_dispatch+0x7/0x30

 -> #0 (sk_lock-AF_BLUETOOTH-BTPROTO_L2CAP){+.+...}:
        [] check_prev_add+0x6cd/0x6e0
        [] check_prevs_add+0xf6/0x170
        [] validate_chain+0x613/0x790
        [] __lock_acquire+0x4be/0xac0
        [] lock_acquire+0x8d/0xb0
        [] lock_sock_nested+0x8a/0xa0
        [] l2cap_chan_timeout+0x3c/0xe0 [bluetooth]
        [] process_one_work+0x184/0x450
        [] worker_thread+0x15e/0x340
        [] kthread+0x96/0xa0
        [] kernel_thread_helper+0x4/0x10

 other info that might help us debug this:

  Possible unsafe locking scenario:

        CPU0                    CPU1
        ----                    ----
   lock((&(&chan->chan_timer)->work));
                                lock(sk_lock-AF_BLUETOOTH-BTPROTO_L2CAP);
                                lock((&(&chan->chan_timer)->work));
   lock(sk_lock-AF_BLUETOOTH-BTPROTO_L2CAP);

  *** DEADLOCK ***

 2 locks held by kworker/1:1/873:
  #0:  (events){.+.+.+}, at: [] process_one_work+0x126/0x450
  #1:  ((&(&chan->chan_timer)->work)){+.+...}, at: [] process_one_work+0x126/0x450

 stack backtrace:
 Pid: 873, comm: kworker/1:1 Not tainted 3.1.0-05270-ga978dc7-dirty #239
 Call Trace:
  [] print_circular_bug+0xd2/0xe3
  [] check_prev_add+0x6cd/0x6e0
  [] check_prevs_add+0xf6/0x170
  [] validate_chain+0x613/0x790
  [] __lock_acquire+0x4be/0xac0
  [] ? lock_sock_nested+0x66/0xa0
  [] ? lock_release_nested+0x100/0x110
  [] ? lock_sock_nested+0x66/0xa0
  [] lock_acquire+0x8d/0xb0
  [] ? l2cap_chan_timeout+0x3c/0xe0 [bluetooth]
  [] lock_sock_nested+0x8a/0xa0
  [] ? l2cap_chan_timeout+0x3c/0xe0 [bluetooth]
  [] ? process_one_work+0x126/0x450
  [] l2cap_chan_timeout+0x3c/0xe0 [bluetooth]
  [] process_one_work+0x184/0x450
  [] ? process_one_work+0x126/0x450
  [] ? l2cap_security_cfm+0x4e0/0x4e0 [bluetooth]
  [] worker_thread+0x15e/0x340
  [] ? manage_workers+0x110/0x110
  [] kthread+0x96/0xa0
  [] kernel_thread_helper+0x4/0x10
  [] ? retint_restore_args+0xe/0xe
  [] ? __init_kthread_worker+0x70/0x70
  [] ? gs_change+0xb/0xb

Signed-off-by: Ulisses Furquim 
Acked-by: Marcel Holtmann 
Signed-off-by: Gustavo F. Padovan

Bluetooth: Make HCI call directly into SCO and L2CAP event functions

2011-12-22T16:07:29+00:00

The struct hci_proto and all related register/unregister and dispatching
code was removed. HCI core code now call directly the SCO and L2CAP
event functions.

Signed-off-by: Ulisses Furquim 
Acked-by: Marcel Holtmann 
Signed-off-by: Gustavo F. Padovan

Bluetooth: Remove magic numbers from le scan cmd

2011-12-22T16:03:24+00:00

Make code readable by removing magic numbers.

Signed-off-by: Andrei Emeltchenko 
Acked-by: Marcel Holtmann 
Signed-off-by: Gustavo F. Padovan