From owner-p4-projects@FreeBSD.ORG  Mon Feb  2 15:42:35 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BC75016A4D1; Mon,  2 Feb 2004 15:42:35 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7B23616A4D0
	for <perforce@freebsd.org>; Mon,  2 Feb 2004 15:42:35 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 05FAE43D58
	for <perforce@freebsd.org>; Mon,  2 Feb 2004 15:42:02 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i12Nfe0B002443
	for <perforce@freebsd.org>; Mon, 2 Feb 2004 15:41:40 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i12NfdhM002437
	for perforce@freebsd.org; Mon, 2 Feb 2004 15:41:39 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Mon, 2 Feb 2004 15:41:39 -0800 (PST)
Message-Id: <200402022341.i12NfdhM002437@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 46389 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Feb 2004 23:42:36 -0000

http://perforce.freebsd.org/chv.cgi?CH=46389

Change 46389 by sam@sam_ebb on 2004/02/02 15:41:23

	cleanups from madwifi

Affected files ...

.. //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#26 edit

Differences ...

==== //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#26 (text+ko) ====

@@ -2057,7 +2057,7 @@
 		shortPreamble = AH_FALSE;
 	}
 
-	an = (struct ath_node *) ni;
+	an = ATH_NODE(ni);
 	/*
 	 * Calculate Atheros packet type from IEEE80211 packet header
 	 * and setup for rate calculations.
@@ -2228,7 +2228,7 @@
 		, atype			/* Atheros packet type */
 		, MIN(ni->ni_txpower,60)/* txpower */
 		, txrate, try0		/* series 0 rate/tries */
-		, iswep ? sc->sc_ic.ic_wep_txkey : HAL_TXKEYIX_INVALID
+		, iswep ? ic->ic_wep_txkey : HAL_TXKEYIX_INVALID
 		, antenna		/* antenna mode */
 		, flags			/* flags */
 		, ctsrate		/* rts/cts rate */
@@ -2350,7 +2350,7 @@
 
 		ni = bf->bf_node;
 		if (ni != NULL) {
-			an = (struct ath_node *) ni;
+			an = ATH_NODE(ni);
 			if (ds->ds_txstat.ts_status == 0) {
 				an->an_tx_ok++;
 				an->an_tx_antenna = ds->ds_txstat.ts_antenna;
@@ -2909,7 +2909,7 @@
 static void
 ath_rate_update(struct ath_softc *sc, struct ieee80211_node *ni, int rate)
 {
-	struct ath_node *an = (struct ath_node *) ni;
+	struct ath_node *an = ATH_NODE(ni);
 	const HAL_RATE_TABLE *rt = sc->sc_currates;
 	u_int8_t rix;