From owner-cvs-src-old@FreeBSD.ORG Sat Jun 18 11:51:25 2011 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 98945106576E for ; Sat, 18 Jun 2011 11:51:24 +0000 (UTC) (envelope-from bschmidt@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 64F768FC0A for ; Sat, 18 Jun 2011 11:51:24 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id p5IBpO9K018488 for ; Sat, 18 Jun 2011 11:51:24 GMT (envelope-from bschmidt@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id p5IBpO0O018487 for cvs-src-old@freebsd.org; Sat, 18 Jun 2011 11:51:24 GMT (envelope-from bschmidt@repoman.freebsd.org) Message-Id: <201106181151.p5IBpO0O018487@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to bschmidt@repoman.freebsd.org using -f From: Bernhard Schmidt Date: Sat, 18 Jun 2011 11:51:17 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: RELENG_8 Subject: cvs commit: src/sys/dev/iwn if_iwn.c X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Jun 2011 11:51:25 -0000 bschmidt 2011-06-18 11:51:17 UTC FreeBSD src repository Modified files: (Branch: RELENG_8) sys/dev/iwn if_iwn.c Log: SVN rev 223244 on 2011-06-18 11:51:17Z by bschmidt MFC r220691-220694,220700-220702,220704,220710-220711: - Remove the flags argument of iwn_dma_contig_alloc(), it is always set as BUS_DMA_NOWAIT. While here also set BUS_DMA_COHERENT. - OpenBSD uses IWN_RBUF_SIZE not MJUMPAGESIZE for the RX path, also replace caddr_t with void * to be in sync. - In case a new mbuf can't be loaded, reuse the old one. - scratch_paddr has the same address pre-assigned, use that instead. - Rewrite DMA segment handling to be more inline with the OpenBSD code. Also change the m_len == 0 hack to have less code churn. - Make sure to destroy all DMA tags and maps. - Unify TX/RX ring allocation, finish the descriptior DMA stuff before starting with data. - Add missing bus_dmamap_sync calls as well as remove two duplicate ones. - Prevent double-free, also use the same error codes as OpenBSD. - Replace RX/TX ring allocation error messages with something more sane and remove those where the caller already prints one. Revision Changes Path 1.18.2.35 +153 -123 src/sys/dev/iwn/if_iwn.c