From owner-svn-src-all@FreeBSD.ORG Fri Jun 13 19:34:35 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8569C44C; Fri, 13 Jun 2014 19:34:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6711B2E24; Fri, 13 Jun 2014 19:34:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5DJYZOg081733; Fri, 13 Jun 2014 19:34:35 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5DJYZuj081731; Fri, 13 Jun 2014 19:34:35 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201406131934.s5DJYZuj081731@svn.freebsd.org> From: John Baldwin Date: Fri, 13 Jun 2014 19:34:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r267448 - head/sys/dev/ubsec X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jun 2014 19:34:35 -0000 Author: jhb Date: Fri Jun 13 19:34:34 2014 New Revision: 267448 URL: http://svnweb.freebsd.org/changeset/base/267448 Log: Don't check maps for static DMA allocations against NULL to see if an allocation succeeded. Instead, check the tag against NULL. Modified: head/sys/dev/ubsec/ubsec.c Modified: head/sys/dev/ubsec/ubsec.c ============================================================================== --- head/sys/dev/ubsec/ubsec.c Fri Jun 13 19:10:40 2014 (r267447) +++ head/sys/dev/ubsec/ubsec.c Fri Jun 13 19:34:34 2014 (r267448) @@ -2301,25 +2301,25 @@ ubsec_kprocess_modexp_sw(struct ubsec_so errout: if (me != NULL) { - if (me->me_q.q_mcr.dma_map != NULL) + if (me->me_q.q_mcr.dma_tag != NULL) ubsec_dma_free(sc, &me->me_q.q_mcr); - if (me->me_q.q_ctx.dma_map != NULL) { + if (me->me_q.q_ctx.dma_tag != NULL) { bzero(me->me_q.q_ctx.dma_vaddr, me->me_q.q_ctx.dma_size); ubsec_dma_free(sc, &me->me_q.q_ctx); } - if (me->me_M.dma_map != NULL) { + if (me->me_M.dma_tag != NULL) { bzero(me->me_M.dma_vaddr, me->me_M.dma_size); ubsec_dma_free(sc, &me->me_M); } - if (me->me_E.dma_map != NULL) { + if (me->me_E.dma_tag != NULL) { bzero(me->me_E.dma_vaddr, me->me_E.dma_size); ubsec_dma_free(sc, &me->me_E); } - if (me->me_C.dma_map != NULL) { + if (me->me_C.dma_tag != NULL) { bzero(me->me_C.dma_vaddr, me->me_C.dma_size); ubsec_dma_free(sc, &me->me_C); } - if (me->me_epb.dma_map != NULL) + if (me->me_epb.dma_tag != NULL) ubsec_dma_free(sc, &me->me_epb); free(me, M_DEVBUF); } @@ -2502,25 +2502,25 @@ ubsec_kprocess_modexp_hw(struct ubsec_so errout: if (me != NULL) { - if (me->me_q.q_mcr.dma_map != NULL) + if (me->me_q.q_mcr.dma_tag != NULL) ubsec_dma_free(sc, &me->me_q.q_mcr); - if (me->me_q.q_ctx.dma_map != NULL) { + if (me->me_q.q_ctx.dma_tag != NULL) { bzero(me->me_q.q_ctx.dma_vaddr, me->me_q.q_ctx.dma_size); ubsec_dma_free(sc, &me->me_q.q_ctx); } - if (me->me_M.dma_map != NULL) { + if (me->me_M.dma_tag != NULL) { bzero(me->me_M.dma_vaddr, me->me_M.dma_size); ubsec_dma_free(sc, &me->me_M); } - if (me->me_E.dma_map != NULL) { + if (me->me_E.dma_tag != NULL) { bzero(me->me_E.dma_vaddr, me->me_E.dma_size); ubsec_dma_free(sc, &me->me_E); } - if (me->me_C.dma_map != NULL) { + if (me->me_C.dma_tag != NULL) { bzero(me->me_C.dma_vaddr, me->me_C.dma_size); ubsec_dma_free(sc, &me->me_C); } - if (me->me_epb.dma_map != NULL) + if (me->me_epb.dma_tag != NULL) ubsec_dma_free(sc, &me->me_epb); free(me, M_DEVBUF); } @@ -2696,13 +2696,13 @@ ubsec_kprocess_rsapriv(struct ubsec_soft errout: if (rp != NULL) { - if (rp->rpr_q.q_mcr.dma_map != NULL) + if (rp->rpr_q.q_mcr.dma_tag != NULL) ubsec_dma_free(sc, &rp->rpr_q.q_mcr); - if (rp->rpr_msgin.dma_map != NULL) { + if (rp->rpr_msgin.dma_tag != NULL) { bzero(rp->rpr_msgin.dma_vaddr, rp->rpr_msgin.dma_size); ubsec_dma_free(sc, &rp->rpr_msgin); } - if (rp->rpr_msgout.dma_map != NULL) { + if (rp->rpr_msgout.dma_tag != NULL) { bzero(rp->rpr_msgout.dma_vaddr, rp->rpr_msgout.dma_size); ubsec_dma_free(sc, &rp->rpr_msgout); }