Merge "Bluetooth:Show bonding dialog if neither side requires no bonding"

This commit is contained in:
Linux Build Service Account
2012-12-06 01:08:18 -08:00
committed by Gerrit - the friendly Code Review server
+6
View File
@@ -3094,6 +3094,12 @@ int mgmt_user_confirm_request(u16 index, u8 event,
goto no_auto_confirm;
}
/* Show bonding dialog if neither side requires no bonding */
if ((conn->auth_type > 0x01) && (conn->remote_auth > 0x01)) {
if (!loc_mitm && !rem_mitm)
value = 0;
goto no_auto_confirm;
}
if ((!loc_mitm || rem_cap == 0x03) && (!rem_mitm || loc_cap == 0x03))
ev.auto_confirm = 1;