summaryrefslogtreecommitdiffstats
path: root/drivers/target
diff options
context:
space:
mode:
authorMark Rustad <mark.d.rustad@intel.com>2012-12-21 10:58:19 -0800
committerNicholas Bellinger <nab@linux-iscsi.org>2013-01-10 20:08:58 -0800
commitedec8dfefa1f372b2dd8197da555352e76a10c03 (patch)
treedc14408bf9e8eb77c2f89a301f30fd319051c4a5 /drivers/target
parentf2eeba214bcd0215b7f558cab6420e5fd153042b (diff)
downloadlinux-stable-edec8dfefa1f372b2dd8197da555352e76a10c03.tar.gz
linux-stable-edec8dfefa1f372b2dd8197da555352e76a10c03.tar.bz2
linux-stable-edec8dfefa1f372b2dd8197da555352e76a10c03.zip
tcm_fc: Do not report target role when target is not defined
Clear the target role when no target is provided for the node performing a PRLI. Signed-off-by: Mark Rustad <mark.d.rustad@intel.com> Reviewed-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com> Acked by Robert Love <robert.w.love@intel.com> Cc: stable@vger.kernel.org Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers/target')
-rw-r--r--drivers/target/tcm_fc/tfc_sess.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/target/tcm_fc/tfc_sess.c b/drivers/target/tcm_fc/tfc_sess.c
index 59f2b467f9f7..6659dd36e806 100644
--- a/drivers/target/tcm_fc/tfc_sess.c
+++ b/drivers/target/tcm_fc/tfc_sess.c
@@ -355,11 +355,11 @@ static int ft_prli_locked(struct fc_rport_priv *rdata, u32 spp_len,
tport = ft_tport_create(rdata->local_port);
if (!tport)
- return 0; /* not a target for this local port */
+ goto not_target; /* not a target for this local port */
acl = ft_acl_get(tport->tpg, rdata);
if (!acl)
- return 0;
+ goto not_target; /* no target for this remote */
if (!rspp)
goto fill;
@@ -402,6 +402,12 @@ fill:
fcp_parm &= ~FCP_SPPF_RETRY;
spp->spp_params = htonl(fcp_parm | FCP_SPPF_TARG_FCN);
return FC_SPP_RESP_ACK;
+
+not_target:
+ fcp_parm = ntohl(spp->spp_params);
+ fcp_parm &= ~FCP_SPPF_TARG_FCN;
+ spp->spp_params = htonl(fcp_parm);
+ return 0;
}
/**