Date: Sat, 25 Mar 2017 02:42:52 +0000 (UTC) From: Adrian Chadd <adrian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r315923 - head/sys/dev/iwm Message-ID: <201703250242.v2P2gqR7038086@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adrian Date: Sat Mar 25 02:42:52 2017 New Revision: 315923 URL: https://svnweb.freebsd.org/changeset/base/315923 Log: [iwm] Tiny cleanup in iwm_rx_addbuf(). Obtained from: dragonflybsd.git 3370bc5504ebb3c1b9bb960a185cd0c8052a2845 Modified: head/sys/dev/iwm/if_iwm.c Modified: head/sys/dev/iwm/if_iwm.c ============================================================================== --- head/sys/dev/iwm/if_iwm.c Sat Mar 25 02:28:21 2017 (r315922) +++ head/sys/dev/iwm/if_iwm.c Sat Mar 25 02:42:52 2017 (r315923) @@ -3032,7 +3032,7 @@ iwm_rx_addbuf(struct iwm_softc *sc, int struct iwm_rx_ring *ring = &sc->rxq; struct iwm_rx_data *data = &ring->data[idx]; struct mbuf *m; - bus_dmamap_t dmamap = NULL; + bus_dmamap_t dmamap; bus_dma_segment_t seg; int nsegs, error; @@ -3046,7 +3046,8 @@ iwm_rx_addbuf(struct iwm_softc *sc, int if (error != 0) { device_printf(sc->sc_dev, "%s: can't map mbuf, error %d\n", __func__, error); - goto fail; + m_freem(m); + return error; } if (data->m != NULL) @@ -3067,9 +3068,6 @@ iwm_rx_addbuf(struct iwm_softc *sc, int BUS_DMASYNC_PREWRITE); return 0; -fail: - m_freem(m); - return error; } /* iwlwifi: mvm/rx.c */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703250242.v2P2gqR7038086>