From: Johan Hedberg Date: Wed, 19 Jan 2011 06:36:48 +0000 (+0530) Subject: Revert "Bluetooth: Update sec_level/auth_type for already existing connections" X-Git-Tag: v2.6.38-rc3~29^2~4^2~11 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88644bb9fee591b2743a881923263bc28df4cded;p=pandora-kernel.git Revert "Bluetooth: Update sec_level/auth_type for already existing connections" This reverts commit 045309820afe047920a50de25634dab46a1e851d. That commit is wrong for two reasons: - The conn->sec_level shouldn't be updated without performing authentication first (as it's supposed to represent the level of security that the existing connection has) - A higher auth_type value doesn't mean "more secure" like the commit seems to assume. E.g. dedicated bonding with MITM protection is 0x03 whereas general bonding without MITM protection is 0x04. hci_conn_auth already takes care of updating conn->auth_type so hci_connect doesn't need to do it. Signed-off-by: Johan Hedberg Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan --- Reading git-diff-tree failed