Merge branch 'for-3.20/drivers' of git://git.kernel.dk/linux-block

[cascardo/linux.git] / include / linux / libata.h

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 61df823..fc03efa 100644 (file)
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -823,10 +823,10 @@ struct ata_port {
        unsigned int            cbl;    /* cable type; ATA_CBL_xxx */
 
        struct ata_queued_cmd   qcmd[ATA_MAX_QUEUE];
-       unsigned long           qc_allocated;
+       unsigned long           sas_tag_allocated; /* for sas tag allocation only */
        unsigned int            qc_active;
        int                     nr_active_links; /* #links with active qcs */
-       unsigned int            last_tag;       /* track next tag hw expects */
+       unsigned int            sas_last_tag;   /* track next tag hw expects */
 
        struct ata_link         link;           /* host default link */
        struct ata_link         *slave_link;    /* see ata_slave_link_init() */
@@ -1352,6 +1352,7 @@ extern struct device_attribute *ata_common_sdev_attrs[];
        .ioctl                  = ata_scsi_ioctl,               \
        .queuecommand           = ata_scsi_queuecmd,            \
        .can_queue              = ATA_DEF_QUEUE,                \
+       .tag_alloc_policy       = BLK_TAG_ALLOC_RR,             \
        .this_id                = ATA_SHT_THIS_ID,              \
        .cmd_per_lun            = ATA_SHT_CMD_PER_LUN,          \
        .emulated               = ATA_SHT_EMULATED,             \