Message ID | 20180122102140.GA23912@mwanda (mailing list archive) |
---|---|
State | Not Applicable |
Delegated to: | Herbert Xu |
Headers | show |
On 22-01-2018 15:51, Dan Carpenter wrote: > We removed some if statements but left these statements indented too > far. HI Dan, Change already applied to cryptodev tree. https://www.mail-archive.com/linux-crypto@vger.kernel.org/msg30560.html > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > > diff --git a/drivers/crypto/chelsio/chcr_algo.c b/drivers/crypto/chelsio/chcr_algo.c > index a9c894bf9c01..34a02d690548 100644 > --- a/drivers/crypto/chelsio/chcr_algo.c > +++ b/drivers/crypto/chelsio/chcr_algo.c > @@ -2112,11 +2112,11 @@ static struct sk_buff *create_authenc_wr(struct aead_request *req, > error = chcr_aead_common_init(req, op_type); > if (error) > return ERR_PTR(error); > - dnents = sg_nents_xlen(req->dst, assoclen, CHCR_DST_SG_SIZE, 0); > - dnents += sg_nents_xlen(req->dst, req->cryptlen + > - (op_type ? -authsize : authsize), CHCR_DST_SG_SIZE, > - req->assoclen); > - dnents += MIN_AUTH_SG; // For IV > + dnents = sg_nents_xlen(req->dst, assoclen, CHCR_DST_SG_SIZE, 0); > + dnents += sg_nents_xlen(req->dst, req->cryptlen + > + (op_type ? -authsize : authsize), CHCR_DST_SG_SIZE, > + req->assoclen); > + dnents += MIN_AUTH_SG; // For IV > > dst_size = get_space_for_phys_dsgl(dnents); > kctx_len = (ntohl(KEY_CONTEXT_CTX_LEN_V(aeadctx->key_ctx_hdr)) << 4)
diff --git a/drivers/crypto/chelsio/chcr_algo.c b/drivers/crypto/chelsio/chcr_algo.c index a9c894bf9c01..34a02d690548 100644 --- a/drivers/crypto/chelsio/chcr_algo.c +++ b/drivers/crypto/chelsio/chcr_algo.c @@ -2112,11 +2112,11 @@ static struct sk_buff *create_authenc_wr(struct aead_request *req, error = chcr_aead_common_init(req, op_type); if (error) return ERR_PTR(error); - dnents = sg_nents_xlen(req->dst, assoclen, CHCR_DST_SG_SIZE, 0); - dnents += sg_nents_xlen(req->dst, req->cryptlen + - (op_type ? -authsize : authsize), CHCR_DST_SG_SIZE, - req->assoclen); - dnents += MIN_AUTH_SG; // For IV + dnents = sg_nents_xlen(req->dst, assoclen, CHCR_DST_SG_SIZE, 0); + dnents += sg_nents_xlen(req->dst, req->cryptlen + + (op_type ? -authsize : authsize), CHCR_DST_SG_SIZE, + req->assoclen); + dnents += MIN_AUTH_SG; // For IV dst_size = get_space_for_phys_dsgl(dnents); kctx_len = (ntohl(KEY_CONTEXT_CTX_LEN_V(aeadctx->key_ctx_hdr)) << 4)
We removed some if statements but left these statements indented too far. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>