summaryrefslogtreecommitdiffstats
path: root/target/linux/oxnas/patches-4.14/999-libata-hacks.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2020-10-07 16:53:22 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2020-10-12 09:45:54 +0200
commit9c718b5478ac5df8ca4f27dbb70a6201c385aada (patch)
treee73b499786367a1f7b65a20cea640a09ac8e678f /target/linux/oxnas/patches-4.14/999-libata-hacks.patch
parentb21bea7b1b92abefad53bcfe509b7e44dd488c79 (diff)
downloadopenwrt-9c718b5478ac5df8ca4f27dbb70a6201c385aada.tar.gz
openwrt-9c718b5478ac5df8ca4f27dbb70a6201c385aada.tar.bz2
openwrt-9c718b5478ac5df8ca4f27dbb70a6201c385aada.zip
kernel: bump 4.14 to 4.14.200
Refreshed all patches. Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/oxnas/patches-4.14/999-libata-hacks.patch')
-rw-r--r--target/linux/oxnas/patches-4.14/999-libata-hacks.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/oxnas/patches-4.14/999-libata-hacks.patch b/target/linux/oxnas/patches-4.14/999-libata-hacks.patch
index 0fb79dfaa8..d5c425b877 100644
--- a/target/linux/oxnas/patches-4.14/999-libata-hacks.patch
+++ b/target/linux/oxnas/patches-4.14/999-libata-hacks.patch
@@ -15,7 +15,7 @@
/* initialize internal qc */
/* XXX: Tag 0 is used for drivers with legacy EH as some
-@@ -5129,6 +5137,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
+@@ -5132,6 +5140,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);
-@@ -5174,6 +5185,8 @@ void ata_qc_free(struct ata_queued_cmd *
+@@ -5177,6 +5188,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,8 +36,8 @@
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
-@@ -923,6 +923,8 @@ struct ata_port_operations {
- void (*qc_prep)(struct ata_queued_cmd *qc);
+@@ -924,6 +924,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);
+ int (*qc_new)(struct ata_port *ap);
@@ -45,7 +45,7 @@
/*
* Configuration and exception handling
-@@ -1013,6 +1015,9 @@ struct ata_port_operations {
+@@ -1014,6 +1016,9 @@ struct ata_port_operations {
void (*phy_reset)(struct ata_port *ap);
void (*eng_timeout)(struct ata_port *ap);