From owner-p4-projects@FreeBSD.ORG Tue Mar 29 21:03:02 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0839016A4D0; Tue, 29 Mar 2005 21:03:02 +0000 (GMT) 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 D2E9716A4CE for ; Tue, 29 Mar 2005 21:03:01 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8848343D39 for ; Tue, 29 Mar 2005 21:03:01 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2TL31J0071497 for ; Tue, 29 Mar 2005 21:03:01 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2TL31ES071494 for perforce@freebsd.org; Tue, 29 Mar 2005 21:03:01 GMT (envelope-from sam@freebsd.org) Date: Tue, 29 Mar 2005 21:03:01 GMT Message-Id: <200503292103.j2TL31ES071494@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 74061 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Mar 2005 21:03:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=74061 Change 74061 by sam@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 -__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 -__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) {