aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/scsi/libfc/fc_fcp.c5
-rw-r--r--include/scsi/libfc.h2
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c
index a7d956ad16e3..a36c652edbba 100644
--- a/drivers/scsi/libfc/fc_fcp.c
+++ b/drivers/scsi/libfc/fc_fcp.c
@@ -1150,8 +1150,9 @@ static int fc_fcp_cmd_send(struct fc_lport *lport, struct fc_fcp_pkt *fsp,
1150 1150
1151 setup_timer(&fsp->timer, fc_fcp_timeout, (unsigned long)fsp); 1151 setup_timer(&fsp->timer, fc_fcp_timeout, (unsigned long)fsp);
1152 1152
1153 if (fsp->tgt_flags & FC_RP_FLAGS_REC_SUPPORTED) 1153 if (rpriv->flags & FC_RP_FLAGS_REC_SUPPORTED)
1154 fc_fcp_timer_set(fsp, rec_tov); 1154 fc_fcp_timer_set(fsp, rec_tov);
1155
1155unlock: 1156unlock:
1156 fc_fcp_unlock_pkt(fsp); 1157 fc_fcp_unlock_pkt(fsp);
1157 return rc; 1158 return rc;
@@ -1867,8 +1868,6 @@ static int fc_queuecommand_lck(struct scsi_cmnd *sc_cmd, void (*done)(struct scs
1867 } 1868 }
1868 put_cpu(); 1869 put_cpu();
1869 1870
1870 fsp->tgt_flags = rpriv->flags;
1871
1872 init_timer(&fsp->timer); 1871 init_timer(&fsp->timer);
1873 fsp->timer.data = (unsigned long)fsp; 1872 fsp->timer.data = (unsigned long)fsp;
1874 1873
diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
index 5c4c1678f7be..3eb3915eb557 100644
--- a/include/scsi/libfc.h
+++ b/include/scsi/libfc.h
@@ -263,7 +263,6 @@ struct fc_seq_els_data {
263 * struct fc_fcp_pkt - FCP request structure (one for each scsi_cmnd request) 263 * struct fc_fcp_pkt - FCP request structure (one for each scsi_cmnd request)
264 * @lp: The associated local port 264 * @lp: The associated local port
265 * @state: The state of the I/O 265 * @state: The state of the I/O
266 * @tgt_flags: Target's flags
267 * @ref_cnt: Reference count 266 * @ref_cnt: Reference count
268 * @scsi_pkt_lock: Lock to protect the SCSI packet (must be taken before the 267 * @scsi_pkt_lock: Lock to protect the SCSI packet (must be taken before the
269 * host_lock if both are to be held at the same time) 268 * host_lock if both are to be held at the same time)
@@ -298,7 +297,6 @@ struct fc_fcp_pkt {
298 /* Housekeeping information */ 297 /* Housekeeping information */
299 struct fc_lport *lp; 298 struct fc_lport *lp;
300 u16 state; 299 u16 state;
301 u16 tgt_flags;
302 atomic_t ref_cnt; 300 atomic_t ref_cnt;
303 spinlock_t scsi_pkt_lock; 301 spinlock_t scsi_pkt_lock;
304 302