From owner-p4-projects@FreeBSD.ORG Mon Mar 17 21:44:10 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 33ED81065673; Mon, 17 Mar 2008 21:44:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CCC72106567B for ; Mon, 17 Mar 2008 21:44:09 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B5E808FC38 for ; Mon, 17 Mar 2008 21:44:09 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2HLi9Xi008421 for ; Mon, 17 Mar 2008 21:44:09 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2HLi9NA008419 for perforce@freebsd.org; Mon, 17 Mar 2008 21:44:09 GMT (envelope-from sam@freebsd.org) Date: Mon, 17 Mar 2008 21:44:09 GMT Message-Id: <200803172144.m2HLi9NA008419@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 Cc: Subject: PERFORCE change 137954 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Mar 2008 21:44:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=137954 Change 137954 by sam@sam_ebb on 2008/03/17 21:43:34 track rssadapt change Affected files ... .. //depot/projects/vap/sys/dev/ral/rt2560.c#20 edit .. //depot/projects/vap/sys/dev/ral/rt2560var.h#12 edit Differences ... ==== //depot/projects/vap/sys/dev/ral/rt2560.c#20 (text) ==== @@ -106,8 +106,6 @@ struct rt2560_rx_ring *); static struct ieee80211_node *rt2560_node_alloc( struct ieee80211_node_table *); -static void rt2560_iter_func(void *, struct ieee80211_node *); -static void rt2560_update_rssadapt(void *); static void rt2560_newassoc(struct ieee80211_node *, int); static int rt2560_newstate(struct ieee80211vap *, enum ieee80211_state, int); @@ -429,8 +427,7 @@ vap->iv_newstate = rt2560_newstate; vap->iv_update_beacon = rt2560_beacon_update; - callout_init(&rvp->rssadapt_ch, CALLOUT_MPSAFE); - ieee80211_rssadapt_init(&rvp->rssadapt, vap); + ieee80211_rssadapt_init(&rvp->rssadapt, vap, 100 /*ms*/); /* complete setup */ ieee80211_vap_attach(vap, ieee80211_media_change, ieee80211_media_status); @@ -444,7 +441,7 @@ { struct rt2560_vap *rvp = RT2560_VAP(vap); - callout_stop(&rvp->rssadapt_ch); + ieee80211_rssadapt_cleanup(&rvp->rssadapt); ieee80211_vap_detach(vap); free(rvp, M_80211_VAP); } @@ -775,37 +772,6 @@ return (rn != NULL) ? &rn->ni : NULL; } -/* - * This function is called for each node present in the node station table. - */ -static void -rt2560_iter_func(void *arg, struct ieee80211_node *ni) -{ - struct ieee80211vap *vap = arg; - - if (ni->ni_vap == vap) - ieee80211_rssadapt_updatestats(&RT2560_NODE(ni)->rssadapt); -} - -/* - * This function is called periodically (every 100ms) in RUN state to update - * the rate adaptation statistics. - */ -static void -rt2560_update_rssadapt(void *arg) -{ - struct ieee80211vap *vap = arg; - struct rt2560_vap *rvp = RT2560_VAP(vap); - - if (vap->iv_opmode != IEEE80211_M_STA) { - struct ieee80211com *ic = vap->iv_ic; - ieee80211_iterate_nodes(&ic->ic_sta, rt2560_iter_func, arg); - } else - rt2560_iter_func(arg, vap->iv_bss); - - callout_reset(&rvp->rssadapt_ch, hz / 10, rt2560_update_rssadapt, vap); -} - static void rt2560_newassoc(struct ieee80211_node *ni, int isnew) { @@ -824,8 +790,6 @@ int error; if (nstate == IEEE80211_S_INIT && vap->iv_state == IEEE80211_S_RUN) { - callout_stop(&rvp->rssadapt_ch); - /* abort TSF synchronization */ RAL_WRITE(sc, RT2560_CSR14, 0); @@ -837,7 +801,6 @@ if (error == 0 && nstate == IEEE80211_S_RUN) { struct ieee80211_node *ni = vap->iv_bss; - const struct ieee80211_txparam *tp; struct mbuf *m; if (vap->iv_opmode != IEEE80211_M_MONITOR) { @@ -867,11 +830,6 @@ /* fake a join to init the tx rate */ rt2560_newassoc(ni, 1); } - tp = &vap->iv_txparms[ieee80211_chan2mode(ni->ni_chan)]; - if (tp->ucastrate == IEEE80211_FIXED_RATE_NONE) - callout_reset(&rvp->rssadapt_ch, hz / 10, - rt2560_update_rssadapt, vap); - rt2560_enable_tsf_sync(sc); } } @@ -1018,8 +976,9 @@ case RT2560_TX_SUCCESS: DPRINTFN(sc, 10, "%s\n", "data frame sent successfully"); if (data->rix != IEEE80211_FIXED_RATE_NONE) { - ieee80211_rssadapt_tx_complete(&rn->rssadapt, 1, - m->m_pkthdr.len, data->rix, data->rssi); + ieee80211_rssadapt_tx_complete(&rn->rssadapt, + IEEE80211_RSSADAPT_SUCCESS, + m->m_pkthdr.len, data->rssi); } ifp->if_opackets++; break; @@ -1034,8 +993,9 @@ DPRINTFN(sc, 9, "%s\n", "sending data frame failed (too much retries)"); if (data->rix != IEEE80211_FIXED_RATE_NONE) { - ieee80211_rssadapt_tx_complete(&rn->rssadapt, 0, - m->m_pkthdr.len, data->rix, data->rssi); + ieee80211_rssadapt_tx_complete(&rn->rssadapt, + IEEE80211_RSSADAPT_FAILURE, + m->m_pkthdr.len, data->rssi); } ifp->if_oerrors++; break; @@ -1820,7 +1780,6 @@ struct ifnet *ifp = sc->sc_ifp; struct rt2560_tx_desc *desc; struct rt2560_tx_data *data; - struct rt2560_node *rn; struct ieee80211_frame *wh; const struct ieee80211_txparam *tp; struct ieee80211_key *k; @@ -1840,15 +1799,10 @@ } else if (tp->ucastrate != IEEE80211_FIXED_RATE_NONE) { rate = tp->ucastrate; } else { - struct ieee80211_rateset *rs; - - rs = &ni->ni_rates; - rn = RT2560_NODE(ni); - ni->ni_txrate = ieee80211_rssadapt_choose(&rn->rssadapt, rs, + (void) ieee80211_rssadapt_choose(ni, &RT2560_NODE(ni)->rssadapt, m0->m_pkthdr.len); - rate = rs->rs_rates[ni->ni_txrate]; + rate = ni->ni_txrate; } - rate &= IEEE80211_RATE_VAL; if (wh->i_fc[1] & IEEE80211_FC1_WEP) { k = ieee80211_crypto_encap(ni, m0); ==== //depot/projects/vap/sys/dev/ral/rt2560var.h#12 (text) ==== @@ -103,7 +103,6 @@ struct ieee80211vap ral_vap; struct ieee80211_beacon_offsets ral_bo; struct ieee80211_rssadapt rssadapt; - struct callout rssadapt_ch; int (*ral_newstate)(struct ieee80211vap *, enum ieee80211_state, int);