linux-toradex.git/net/bluetooth/hci_core.c, branch v3.0.25 Linux kernel for Apalis and Colibri modules Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem 2011-05-05T17:32:35+00:00 John W. Linville linville@tuxdriver.com 2011-05-05T17:32:35+00:00 a70171dce9cd44cb06c7d299eba9fa87a8933045 Conflicts: drivers/net/wireless/libertas/if_cs.c drivers/net/wireless/rtlwifi/pci.c net/bluetooth/l2cap_sock.c 
Conflicts:
	drivers/net/wireless/libertas/if_cs.c
	drivers/net/wireless/rtlwifi/pci.c
	net/bluetooth/l2cap_sock.c
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6 2011-04-29T19:28:49+00:00 John W. Linville linville@tuxdriver.com 2011-04-29T19:28:49+00:00 dee04cac28b5f8a99e002ec1b2e0a49f3155bda0 






Bluetooth: Add store_hint parameter to mgmt_new_key
2011-04-28T19:14:43+00:00

Johan Hedberg
johan.hedberg@nokia.com

2011-04-28T18:29:03+00:00

4df378a10e31698df1679f3329301d773a654b61

Even for keys that shouldn't be stored some use cases require the
knowledge of a new key having been created so that the conclusion of a
successful pairing can be made. Therefore, always send the mgmt_new_key
event but add a store_hint parameter to it to indicate to user space
whether the key should be stored or not.

Signed-off-by: Johan Hedberg <johan.hedberg@nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>





Even for keys that shouldn't be stored some use cases require the
knowledge of a new key having been created so that the conclusion of a
successful pairing can be made. Therefore, always send the mgmt_new_key
event but add a store_hint parameter to it to indicate to user space
whether the key should be stored or not.

Signed-off-by: Johan Hedberg <johan.hedberg@nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>







Bluetooth: Remove old_key_type from mgmt_ev_new_key
2011-04-28T19:14:42+00:00

Johan Hedberg
johan.hedberg@nokia.com

2011-04-28T18:29:02+00:00

4748fed2d1a2a7a816277754498b8aa70850e051

User space shouldn't have any need for the old key type so remove it
from the corresponding Management interface event.

Signed-off-by: Johan Hedberg <johan.hedberg@nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>





User space shouldn't have any need for the old key type so remove it
from the corresponding Management interface event.

Signed-off-by: Johan Hedberg <johan.hedberg@nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>







Bluetooth: Fix connection key type updating for buggy controllers
2011-04-28T19:14:41+00:00

Johan Hedberg
johan.hedberg@nokia.com

2011-04-28T18:29:01+00:00

655fe6ece7e71b37c17577ae485d11bf701c95f7

If a controller generates a changed combination key as its first key the
connection key type will not be correctly set. In these situations make
sure the update the connection key type when such a buggy controller is
detected.

Signed-off-by: Johan Hedberg <johan.hedberg@nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>





If a controller generates a changed combination key as its first key the
connection key type will not be correctly set. In these situations make
sure the update the connection key type when such a buggy controller is
detected.

Signed-off-by: Johan Hedberg <johan.hedberg@nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>







Bluetooth: Fix old_key_type logic for non-persistent keys
2011-04-28T19:14:41+00:00

Johan Hedberg
johan.hedberg@nokia.com

2011-04-28T18:29:00+00:00

12adcf3a953c3aa4006d855aa638133bf018ceac

Even if there's no previous key stored the connection might still be
secured with a non-persistent key and in that case the key type in the
hci_conn struct should be checked.

Signed-off-by: Johan Hedberg <johan.hedberg@nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>





Even if there's no previous key stored the connection might still be
secured with a non-persistent key and in that case the key type in the
hci_conn struct should be checked.

Signed-off-by: Johan Hedberg <johan.hedberg@nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>







Bluetooth: Fix link key persistent storage criteria
2011-04-28T19:14:40+00:00

Johan Hedberg
johan.hedberg@nokia.com

2011-04-28T18:28:59+00:00

d25e28abe58d2bcedf6025a6ccc532c29a19046f

Link keys should only be stored if very specific criteria of the
authentication process are fulfilled. This patch essentially copies the
criteria that user space has so far been using to the kernel side so
that the management interface works properly.

Signed-off-by: Johan Hedberg <johan.hedberg@nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>





Link keys should only be stored if very specific criteria of the
authentication process are fulfilled. This patch essentially copies the
criteria that user space has so far been using to the kernel side so
that the management interface works properly.

Signed-off-by: Johan Hedberg <johan.hedberg@nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>







Bluetooth: Add definitions for link key types
2011-04-28T18:02:04+00:00

Waldemar Rymarkiewicz
waldemar.rymarkiewicz@tieto.com

2011-04-28T10:07:53+00:00

b6020ba055c7f1ca901dc8751ecc7c9de58164db

Introduce the link key types defs and use them instead of magic numbers.

Signed-off-by: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>





Introduce the link key types defs and use them instead of magic numbers.

Signed-off-by: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>







Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
2011-04-26T19:39:10+00:00

John W. Linville
linville@tuxdriver.com

2011-04-26T19:39:10+00:00

429576b97c623b9c4e3375fb7c37bce377f51e68












Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2011-04-26T19:16:46+00:00

David S. Miller
davem@davemloft.net

2011-04-26T19:16:46+00:00

2bd93d7af1581d40e3c4b25242472661cb7c637a

Resolved logic conflicts causing a build failure due to
drivers/net/r8169.c changes using a patch from Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>





Resolved logic conflicts causing a build failure due to
drivers/net/r8169.c changes using a patch from Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>