PERFORCE change 74061 for review

[Sam Leffler]

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

Change 74061 by sam at sam_ebb on 2005/03/29 21:02:44

	IFC

Affected files ...

.. //depot/projects/wifi/sys/dev/ath/ath_rate/amrr/amrr.c#9 integrate
.. //depot/projects/wifi/sys/dev/ath/ath_rate/onoe/onoe.c#9 integrate

Differences ...

==== //depot/projects/wifi/sys/dev/ath/ath_rate/amrr/amrr.c#9 (text+ko) ====

@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/amrr/amrr.c,v 1.4 2005/01/24 19:32:10 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/amrr/amrr.c,v 1.5 2005/03/29 20:59:49 sam Exp $");
 
 /*
  * AMRR rate control. See:
@@ -326,7 +326,9 @@
 static void
 ath_rate_cb(void *arg, struct ieee80211_node *ni)
 {
-	ath_rate_update(ni->ni_ic->ic_ifp->if_softc, ni, (int)(uintptr_t) arg);
+	struct ath_softc *sc = arg;
+
+	ath_rate_update(sc, ni, 0);
 }
 
 /*
@@ -361,7 +363,7 @@
 		 * For any other operating mode we want to reset the
 		 * tx rate state of each node.
 		 */
-		ieee80211_iterate_nodes(&ic->ic_sta, ath_rate_cb, 0);
+		ieee80211_iterate_nodes(&ic->ic_sta, ath_rate_cb, sc);
 		ath_rate_update(sc, ic->ic_bss, 0);
 	}
 	if (ic->ic_fixed_rate == -1 && state == IEEE80211_S_RUN) {

==== //depot/projects/wifi/sys/dev/ath/ath_rate/onoe/onoe.c#9 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/onoe/onoe.c,v 1.4 2005/01/24 19:32:10 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/onoe/onoe.c,v 1.5 2005/03/29 20:59:49 sam Exp $");
 
 /*
  * Atsushi Onoe's rate control algorithm.
@@ -310,7 +310,9 @@
 static void
 ath_rate_cb(void *arg, struct ieee80211_node *ni)
 {
-	ath_rate_update(ni->ni_ic->ic_ifp->if_softc, ni, (int)(uintptr_t) arg);
+	struct ath_softc *sc = arg;
+
+	ath_rate_update(sc, ni, 0);
 }
 
 /*
@@ -345,7 +347,7 @@
 		 * For any other operating mode we want to reset the
 		 * tx rate state of each node.
 		 */
-		ieee80211_iterate_nodes(&ic->ic_sta, ath_rate_cb, 0);
+		ieee80211_iterate_nodes(&ic->ic_sta, ath_rate_cb, sc);
 		ath_rate_update(sc, ic->ic_bss, 0);
 	}
 	if (ic->ic_fixed_rate == -1 && state == IEEE80211_S_RUN) {