PERFORCE change 46389 for review

[Sam Leffler]

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

Change 46389 by sam at 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;