From owner-svn-src-all@FreeBSD.ORG  Sat Apr 16 09:39:08 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 79F71106566C;
	Sat, 16 Apr 2011 09:39:08 +0000 (UTC)
	(envelope-from bschmidt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 68D408FC08;
	Sat, 16 Apr 2011 09:39:08 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p3G9d8D6098490;
	Sat, 16 Apr 2011 09:39:08 GMT
	(envelope-from bschmidt@svn.freebsd.org)
Received: (from bschmidt@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3G9d8fY098488;
	Sat, 16 Apr 2011 09:39:08 GMT
	(envelope-from bschmidt@svn.freebsd.org)
Message-Id: <201104160939.p3G9d8fY098488@svn.freebsd.org>
From: Bernhard Schmidt <bschmidt@FreeBSD.org>
Date: Sat, 16 Apr 2011 09:39:08 +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: r220694 - head/sys/dev/iwn
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 16 Apr 2011 09:39:08 -0000

Author: bschmidt
Date: Sat Apr 16 09:39:08 2011
New Revision: 220694
URL: http://svn.freebsd.org/changeset/base/220694

Log:
  scratch_paddr has the same address pre-assigned, use that instead.

Modified:
  head/sys/dev/iwn/if_iwn.c

Modified: head/sys/dev/iwn/if_iwn.c
==============================================================================
--- head/sys/dev/iwn/if_iwn.c	Sat Apr 16 09:34:40 2011	(r220693)
+++ head/sys/dev/iwn/if_iwn.c	Sat Apr 16 09:39:08 2011	(r220694)
@@ -3145,7 +3145,6 @@ iwn_tx_data_raw(struct iwn_softc *sc, st
 	struct iwn_tx_desc *desc;
 	struct iwn_tx_data *data;
 	struct mbuf *mnew;
-	bus_addr_t paddr;
 	bus_dma_segment_t segs[IWN_MAX_SCATTER];
 	uint32_t flags;
 	u_int hdrlen;
@@ -3246,9 +3245,8 @@ iwn_tx_data_raw(struct iwn_softc *sc, st
 	txant = IWN_LSB(sc->txchainmask);
 	tx->rflags |= IWN_RFLAG_ANT(txant);
 	/* Set physical address of "scratch area". */
-	paddr = ring->cmd_dma.paddr + ring->cur * sizeof (struct iwn_tx_cmd);
-	tx->loaddr = htole32(IWN_LOADDR(paddr));
-	tx->hiaddr = IWN_HIADDR(paddr);
+	tx->loaddr = htole32(IWN_LOADDR(data->scratch_paddr));
+	tx->hiaddr = IWN_HIADDR(data->scratch_paddr);
 
 	/* Copy 802.11 header in TX command. */
 	memcpy((uint8_t *)(tx + 1), wh, hdrlen);