--- 8c59afcc0c1de2b3c07e4b31fb7d5031b22b3409
+++ e99fe385fba293d6a7fe2c558b7d454f669f52b8
@@ -579,7 +579,7 @@ static inline void hci_cs_create_conn(st
 		}
 	} else {
 		if (!conn) {
-			conn = hci_conn_add(hdev, ACL_LINK, 0, &cp->bdaddr);
+			conn = hci_conn_add(hdev, ACL_LINK, &cp->bdaddr);
 			if (conn) {
 				conn->out = 1;
 				conn->link_mode |= HCI_LM_MASTER;
@@ -964,9 +964,7 @@ static inline void hci_conn_request_evt(
 
 		conn = hci_conn_hash_lookup_ba(hdev, ev->link_type, &ev->bdaddr);
 		if (!conn) {
-			/* pkt_type not yet used for incoming connections */
-			if (!(conn = hci_conn_add(hdev, ev->link_type, 0,
-							&ev->bdaddr))) {
+			if (!(conn = hci_conn_add(hdev, ev->link_type, &ev->bdaddr))) {
 				BT_ERR("No memmory for new connection");
 				hci_dev_unlock(hdev);
 				return;
@@ -1051,8 +1049,7 @@ static inline void hci_auth_complete_evt
 	if (conn) {
 		if (!ev->status)
 			conn->link_mode |= HCI_LM_AUTH;
-		else
-			conn->sec_level = BT_SECURITY_LOW;
+
 		clear_bit(HCI_CONN_AUTH_PEND, &conn->pend);
 
 		if (conn->state == BT_CONFIG) {
@@ -1701,9 +1698,7 @@ static inline void hci_sync_conn_complet
 		hci_conn_add_sysfs(conn);
 		break;
 
-	case 0x10:	/* Connection Accept Timeout */
 	case 0x1c:	/* SCO interval rejected */
-	case 0x1a:	/* unsupported feature */
 	case 0x1f:	/* Unspecified error */
 		if (conn->out && conn->attempt < 2) {
 			conn->pkt_type = (hdev->esco_type & SCO_ESCO_MASK) |