From owner-svn-src-head@FreeBSD.ORG Fri Jul 31 09:57:42 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8A62C106566B; Fri, 31 Jul 2009 09:57:42 +0000 (UTC) (envelope-from kevlo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 78A118FC08; Fri, 31 Jul 2009 09:57:42 +0000 (UTC) (envelope-from kevlo@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n6V9vgd4062532; Fri, 31 Jul 2009 09:57:42 GMT (envelope-from kevlo@svn.freebsd.org) Received: (from kevlo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6V9vg5g062530; Fri, 31 Jul 2009 09:57:42 GMT (envelope-from kevlo@svn.freebsd.org) Message-Id: <200907310957.n6V9vg5g062530@svn.freebsd.org> From: Kevin Lo Date: Fri, 31 Jul 2009 09:57:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r195989 - head/sys/dev/alc X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 31 Jul 2009 09:57:43 -0000 Author: kevlo Date: Fri Jul 31 09:57:42 2009 New Revision: 195989 URL: http://svn.freebsd.org/changeset/base/195989 Log: Free allocated Rx ring dma memory/tags. Reviewed by: yongari@ Approved by: re (kib) Modified: head/sys/dev/alc/if_alc.c Modified: head/sys/dev/alc/if_alc.c ============================================================================== --- head/sys/dev/alc/if_alc.c Fri Jul 31 08:37:27 2009 (r195988) +++ head/sys/dev/alc/if_alc.c Fri Jul 31 09:57:42 2009 (r195989) @@ -1501,6 +1501,21 @@ alc_dma_free(struct alc_softc *sc) bus_dma_tag_destroy(sc->alc_cdata.alc_tx_ring_tag); sc->alc_cdata.alc_tx_ring_tag = NULL; } + /* Rx ring. */ + if (sc->alc_cdata.alc_rx_ring_tag != NULL) { + if (sc->alc_cdata.alc_rx_ring_map != NULL) + bus_dmamap_unload(sc->alc_cdata.alc_rx_ring_tag, + sc->alc_cdata.alc_rx_ring_map); + if (sc->alc_cdata.alc_rx_ring_map != NULL && + sc->alc_rdata.alc_rx_ring != NULL) + bus_dmamem_free(sc->alc_cdata.alc_rx_ring_tag, + sc->alc_rdata.alc_rx_ring, + sc->alc_cdata.alc_rx_ring_map); + sc->alc_rdata.alc_rx_ring = NULL; + sc->alc_cdata.alc_rx_ring_map = NULL; + bus_dma_tag_destroy(sc->alc_cdata.alc_rx_ring_tag); + sc->alc_cdata.alc_rx_ring_tag = NULL; + } /* Rx return ring. */ if (sc->alc_cdata.alc_rr_ring_tag != NULL) { if (sc->alc_cdata.alc_rr_ring_map != NULL)