diff options
| author | Mark Rustad <mark.d.rustad@intel.com> | 2012-12-21 10:58:19 -0800 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-02-06 04:33:29 +0000 |
| commit | e14478a19adaffac219b268b2e1bece3bde9572a (patch) | |
| tree | 38f8d13640727ea94069531d74f264a86bc7e3db /drivers/target | |
| parent | 5b0877634e54f1ca3041aed21b449250b86d5b38 (diff) | |
| download | linux-stable-e14478a19adaffac219b268b2e1bece3bde9572a.tar.gz linux-stable-e14478a19adaffac219b268b2e1bece3bde9572a.tar.bz2 linux-stable-e14478a19adaffac219b268b2e1bece3bde9572a.zip | |
tcm_fc: Do not report target role when target is not defined
commit edec8dfefa1f372b2dd8197da555352e76a10c03 upstream.
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>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/target')
| -rw-r--r-- | drivers/target/tcm_fc/tfc_sess.c | 10 |
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 4c5d9d760b69..ab0a3fa634ac 100644 --- a/drivers/target/tcm_fc/tfc_sess.c +++ b/drivers/target/tcm_fc/tfc_sess.c @@ -390,11 +390,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; @@ -437,6 +437,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; } /** |