Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 21283916322f579a580e413652cdefbfa3ec676f

Authored by Swen Schillig
Committed by James Bottomley
1 parent 8fdf30d542
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[SCSI] zfcp: remove undefined subtype for status read response 

The status read response FSF_STATUS_READ_SUB_ERROR_PORT is not
defined in the specs and therefore not valid.
All occurrences are removed from the code.

Signed-off-by: Swen Schillig <swen@vnet.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

Showing 3 changed files with 2 additions and 13 deletions Side-by-side Diff

drivers/s390/scsi/zfcp_dbf.c
Diff comments   View file @ 2128391
... ... @@ -615,7 +615,7 @@
615 615 [119] = "unknown protocol status",
616 616 [120] = "unknown fsf command",
617 617 [121] = "no recommendation for status qualifier",
618   - [122] = "status read physical port closed in error",
  618 + [122] = "",
619 619 [123] = "fc service class not supported",
620 620 [124] = "",
621 621 [125] = "need newer zfcp",
drivers/s390/scsi/zfcp_fsf.c
Diff comments   View file @ 2128391
... ... @@ -162,14 +162,7 @@
162 162 list_for_each_entry(port, &adapter->port_list_head, list)
163 163 if (port->d_id == d_id) {
164 164 read_unlock_irqrestore(&zfcp_data.config_lock, flags);
165   - switch (sr_buf->status_subtype) {
166   - case FSF_STATUS_READ_SUB_CLOSE_PHYS_PORT:
167   - zfcp_erp_port_reopen(port, 0, 101, req);
168   - break;
169   - case FSF_STATUS_READ_SUB_ERROR_PORT:
170   - zfcp_erp_port_shutdown(port, 0, 122, req);
171   - break;
172   - }
  165 + zfcp_erp_port_reopen(port, 0, 101, req);
173 166 return;
174 167 }
175 168 read_unlock_irqrestore(&zfcp_data.config_lock, flags);
drivers/s390/scsi/zfcp_fsf.h
Diff comments   View file @ 2128391
... ... @@ -127,10 +127,6 @@
127 127 #define FSF_STATUS_READ_CFDC_UPDATED 0x0000000A
128 128 #define FSF_STATUS_READ_FEATURE_UPDATE_ALERT 0x0000000C
129 129  
130   -/* status subtypes in status read buffer */
131   -#define FSF_STATUS_READ_SUB_CLOSE_PHYS_PORT 0x00000001
132   -#define FSF_STATUS_READ_SUB_ERROR_PORT 0x00000002
133   -
134 130 /* status subtypes for link down */
135 131 #define FSF_STATUS_READ_SUB_NO_PHYSICAL_LINK 0x00000000
136 132 #define FSF_STATUS_READ_SUB_FDISC_FAILED 0x00000001