diff options
author | Martin K. Petersen <martin.petersen@oracle.com> | 2024-07-11 04:23:30 +0200 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2024-07-11 04:23:30 +0200 |
commit | 5e9a522b0779fa67928b7726374e60461e8aa5c5 (patch) | |
tree | 69d560c649c0768577590a3b27d21b6391269b63 /include/scsi/scsi_transport_sas.h | |
parent | Merge patch series "mpi3mr: Support PCI Error Recovery" (diff) | |
parent | scsi: sd: Do not repeat the starting disk message (diff) | |
download | linux-5e9a522b0779fa67928b7726374e60461e8aa5c5.tar.xz linux-5e9a522b0779fa67928b7726374e60461e8aa5c5.zip |
Merge branch '6.10/scsi-fixes' into 6.11/scsi-staging
Pull in my fixes branch to resolve an mpi3mr merge conflict reported
by sfr.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'include/scsi/scsi_transport_sas.h')
-rw-r--r-- | include/scsi/scsi_transport_sas.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/scsi/scsi_transport_sas.h b/include/scsi/scsi_transport_sas.h index 0e75b9277c8c..e3b6ce3cbf88 100644 --- a/include/scsi/scsi_transport_sas.h +++ b/include/scsi/scsi_transport_sas.h @@ -200,6 +200,8 @@ unsigned int sas_is_tlr_enabled(struct scsi_device *); void sas_disable_tlr(struct scsi_device *); void sas_enable_tlr(struct scsi_device *); +bool sas_ata_ncq_prio_supported(struct scsi_device *sdev); + extern struct sas_rphy *sas_end_device_alloc(struct sas_port *); extern struct sas_rphy *sas_expander_alloc(struct sas_port *, enum sas_device_type); void sas_rphy_free(struct sas_rphy *); |