From owner-svn-src-head@freebsd.org  Sat Mar 25 02:42:53 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 50BBBD1C29F;
 Sat, 25 Mar 2017 02:42:53 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 207FD1066;
 Sat, 25 Mar 2017 02:42:53 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2P2gq4D038087;
 Sat, 25 Mar 2017 02:42:52 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2P2gqR7038086;
 Sat, 25 Mar 2017 02:42:52 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201703250242.v2P2gqR7038086@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: adrian set sender to
 adrian@FreeBSD.org using -f
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sat, 25 Mar 2017 02:42:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r315923 - 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-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Mar 2017 02:42:53 -0000

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 */