From 7697ce250bb7b848ffa4c759619b4b262fa354b3 Mon Sep 17 00:00:00 2001
From: Swen Schillig <swen@vnet.ibm.com>
Date: Mon, 2 Mar 2009 13:09:02 +0100
Subject: [PATCH] --- yaml --- r: 136287 b: refs/heads/master c:
 21283916322f579a580e413652cdefbfa3ec676f h: refs/heads/master i:   136285:
 1eb8140309466c702ec6949da59cd112eed2b198   136283:
 2a961de31de19d0bbcf16fe7d833fc6d989c912a   136279:
 489ae8dd2450d8338e510aba1e41fb45292549b0   136271:
 cba0072f20da841c5210e8ab447d06c1ca2033ae   136255:
 02c7edfe4d2ff718beefa6b765435d98db0e6130 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/s390/scsi/zfcp_dbf.c | 2 +-
 trunk/drivers/s390/scsi/zfcp_fsf.c | 9 +--------
 trunk/drivers/s390/scsi/zfcp_fsf.h | 4 ----
 4 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 971fc0ff3478..b5827a29e2e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8fdf30d5429605a4c30cc515c73e5eab140035de
+refs/heads/master: 21283916322f579a580e413652cdefbfa3ec676f
diff --git a/trunk/drivers/s390/scsi/zfcp_dbf.c b/trunk/drivers/s390/scsi/zfcp_dbf.c
index cb6df609953e..ab843f23d428 100644
--- a/trunk/drivers/s390/scsi/zfcp_dbf.c
+++ b/trunk/drivers/s390/scsi/zfcp_dbf.c
@@ -615,7 +615,7 @@ static const char *zfcp_rec_dbf_ids[] = {
 	[119]	= "unknown protocol status",
 	[120]	= "unknown fsf command",
 	[121]	= "no recommendation for status qualifier",
-	[122]	= "status read physical port closed in error",
+	[122]	= "",
 	[123]	= "fc service class not supported",
 	[124]	= "",
 	[125]	= "need newer zfcp",
diff --git a/trunk/drivers/s390/scsi/zfcp_fsf.c b/trunk/drivers/s390/scsi/zfcp_fsf.c
index 9c3f91a343f3..698e42214a37 100644
--- a/trunk/drivers/s390/scsi/zfcp_fsf.c
+++ b/trunk/drivers/s390/scsi/zfcp_fsf.c
@@ -162,14 +162,7 @@ static void zfcp_fsf_status_read_port_closed(struct zfcp_fsf_req *req)
 	list_for_each_entry(port, &adapter->port_list_head, list)
 		if (port->d_id == d_id) {
 			read_unlock_irqrestore(&zfcp_data.config_lock, flags);
-			switch (sr_buf->status_subtype) {
-			case FSF_STATUS_READ_SUB_CLOSE_PHYS_PORT:
-				zfcp_erp_port_reopen(port, 0, 101, req);
-				break;
-			case FSF_STATUS_READ_SUB_ERROR_PORT:
-				zfcp_erp_port_shutdown(port, 0, 122, req);
-				break;
-			}
+			zfcp_erp_port_reopen(port, 0, 101, req);
 			return;
 		}
 	read_unlock_irqrestore(&zfcp_data.config_lock, flags);
diff --git a/trunk/drivers/s390/scsi/zfcp_fsf.h b/trunk/drivers/s390/scsi/zfcp_fsf.h
index 8bb200252347..df7f232faba8 100644
--- a/trunk/drivers/s390/scsi/zfcp_fsf.h
+++ b/trunk/drivers/s390/scsi/zfcp_fsf.h
@@ -127,10 +127,6 @@
 #define FSF_STATUS_READ_CFDC_UPDATED		0x0000000A
 #define FSF_STATUS_READ_FEATURE_UPDATE_ALERT	0x0000000C
 
-/* status subtypes in status read buffer */
-#define FSF_STATUS_READ_SUB_CLOSE_PHYS_PORT	0x00000001
-#define FSF_STATUS_READ_SUB_ERROR_PORT		0x00000002
-
 /* status subtypes for link down */
 #define FSF_STATUS_READ_SUB_NO_PHYSICAL_LINK	0x00000000
 #define FSF_STATUS_READ_SUB_FDISC_FAILED	0x00000001