From owner-svn-src-all@freebsd.org Sat Aug 8 20:07:26 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D9A3C9B6F6A; Sat, 8 Aug 2015 20:07:26 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repo.freebsd.org (repo.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 CA5A61BFD; Sat, 8 Aug 2015 20:07:26 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t78K7QCw026447; Sat, 8 Aug 2015 20:07:26 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from rpaulo@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t78K7QMS026446; Sat, 8 Aug 2015 20:07:26 GMT (envelope-from rpaulo@FreeBSD.org) Message-Id: <201508082007.t78K7QMS026446@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rpaulo set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo Date: Sat, 8 Aug 2015 20:07:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r286466 - head/sys/dev/iwm 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.20 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: Sat, 08 Aug 2015 20:07:26 -0000 Author: rpaulo Date: Sat Aug 8 20:07:25 2015 New Revision: 286466 URL: https://svnweb.freebsd.org/changeset/base/286466 Log: iwm: fix a KASSERT: s/ds_size/ds_len/. Modified: head/sys/dev/iwm/if_iwm_util.c Modified: head/sys/dev/iwm/if_iwm_util.c ============================================================================== --- head/sys/dev/iwm/if_iwm_util.c Sat Aug 8 19:29:59 2015 (r286465) +++ head/sys/dev/iwm/if_iwm_util.c Sat Aug 8 20:07:25 2015 (r286466) @@ -163,7 +163,7 @@ iwm_dma_map_mem(void *arg, bus_dma_segme KASSERT(nsegs <= 2, ("too many DMA segments, %d should be <= 2", nsegs)); if (nsegs > 1) - KASSERT(segs[1].ds_addr == segs[0].ds_addr + segs[0].ds_size, + KASSERT(segs[1].ds_addr == segs[0].ds_addr + segs[0].ds_len, ("fragmented DMA memory")); *(bus_addr_t *)arg = segs[0].ds_addr; } @@ -402,4 +402,3 @@ iwm_free_resp(struct iwm_softc *sc, stru sc->sc_wantresp = -1; wakeup(&sc->sc_wantresp); } -