X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Foxnas%2Fpatches-4.14%2F999-libata-hacks.patch;fp=target%2Flinux%2Foxnas%2Fpatches-4.14%2F999-libata-hacks.patch;h=d5c425b877486879fd16662978a6b6a3ced48043;hb=5d01d05608937f9de005bd0da3347f91e8223616;hp=0fb79dfaa82d80a623fc2399626628b4bff70637;hpb=edda06c7b41de8e6da3b35baf7ff7011a7e014ff;p=openwrt%2Fstaging%2Fhauke.git

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);