kernel: bump 5.10 to 5.10.72

[openwrt/staging/wigyori.git] / target / linux / oxnas / patches-5.10 / 999-libata-hacks.patch

diff --git a/target/linux/oxnas/patches-5.10/999-libata-hacks.patch b/target/linux/oxnas/patches-5.10/999-libata-hacks.patch
index 2751c9fe8882cd7bf7f4caf8d9d33a4635c7e3bc..e34891cbb6790488c081ff4ab079b574de7a0463 100644 (file)
--- a/target/linux/oxnas/patches-5.10/999-libata-hacks.patch
+++ b/target/linux/oxnas/patches-5.10/999-libata-hacks.patch
@@ -15,7 +15,7 @@
        /* initialize internal qc */
        qc = __ata_qc_from_tag(ap, ATA_TAG_INTERNAL);
  
-@@ -4524,6 +4532,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
+@@ -4552,6 +4560,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
        if (unlikely(ap->pflags & ATA_PFLAG_FROZEN))
                return NULL;
  
@@ -25,7 +25,7 @@
        /* libsas case */
        if (ap->flags & ATA_FLAG_SAS_HOST) {
                tag = ata_sas_allocate_tag(ap);
-@@ -4569,6 +4580,8 @@ void ata_qc_free(struct ata_queued_cmd *
+@@ -4597,6 +4608,8 @@ void ata_qc_free(struct ata_queued_cmd *
                qc->tag = ATA_TAG_POISON;
                if (ap->flags & ATA_FLAG_SAS_HOST)
                        ata_sas_free_tag(tag, ap);
@@ -36,7 +36,7 @@
  
 --- a/include/linux/libata.h
 +++ b/include/linux/libata.h
-@@ -911,6 +911,8 @@ struct ata_port_operations {
+@@ -912,6 +912,8 @@ struct ata_port_operations {
        enum ata_completion_errors (*qc_prep)(struct ata_queued_cmd *qc);
        unsigned int (*qc_issue)(struct ata_queued_cmd *qc);
        bool (*qc_fill_rtf)(struct ata_queued_cmd *qc);
@@ -45,7 +45,7 @@
  
        /*
         * Configuration and exception handling
-@@ -1001,6 +1003,9 @@ struct ata_port_operations {
+@@ -1002,6 +1004,9 @@ struct ata_port_operations {
        void (*phy_reset)(struct ata_port *ap);
        void (*eng_timeout)(struct ata_port *ap);