From 419bfd04b171a36d4eb622e02ef55afe0497ed90 Mon Sep 17 00:00:00 2001 From: Mark Rustad Date: Fri, 21 Dec 2012 10:58:19 -0800 Subject: [PATCH] --- yaml --- r: 348839 b: refs/heads/master c: edec8dfefa1f372b2dd8197da555352e76a10c03 h: refs/heads/master i: 348837: 82d9d0acf4eed9915c5b1e9bf2a827f3d501271b 348835: 7458be5be4d0daf6c94de2041decd6175b748f88 348831: 2a9edd5a5718d36cd32e00eade6c2bd18a1dca30 v: v3 --- [refs] | 2 +- trunk/drivers/target/tcm_fc/tfc_sess.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4b761feb39d1..ade6c071f302 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f2eeba214bcd0215b7f558cab6420e5fd153042b +refs/heads/master: edec8dfefa1f372b2dd8197da555352e76a10c03 diff --git a/trunk/drivers/target/tcm_fc/tfc_sess.c b/trunk/drivers/target/tcm_fc/tfc_sess.c index 59f2b467f9f7..6659dd36e806 100644 --- a/trunk/drivers/target/tcm_fc/tfc_sess.c +++ b/trunk/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 @@ static int ft_prli_locked(struct fc_rport_priv *rdata, u32 spp_len, 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; } /**