diff options
| author | Mark Rustad <mark.d.rustad@intel.com> | 2012-12-21 10:58:19 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-21 11:45:14 -0800 |
| commit | 4b77fd473bf78ec6ddd7c6f4d1f03582a4ec34b9 (patch) | |
| tree | af88d9db58a3b219bf9605f3bb3620dd0a309f71 | |
| parent | e86f92f7eaeb01b071d2ca2a473c1efff6e9db68 (diff) | |
| download | lwn-4b77fd473bf78ec6ddd7c6f4d1f03582a4ec34b9.tar.gz lwn-4b77fd473bf78ec6ddd7c6f4d1f03582a4ec34b9.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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 34d7b251986a..9249998a837a 100644 --- a/drivers/target/tcm_fc/tfc_sess.c +++ b/drivers/target/tcm_fc/tfc_sess.c @@ -356,11 +356,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; @@ -403,6 +403,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; } /** |