From owner-svn-src-all@FreeBSD.ORG Sat May 15 23:02:55 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4A2351065670; Sat, 15 May 2010 23:02:55 +0000 (UTC) (envelope-from rpaulo@freebsd.org) Received: from karen.lavabit.com (karen.lavabit.com [72.249.41.33]) by mx1.freebsd.org (Postfix) with ESMTP id CED968FC0C; Sat, 15 May 2010 23:02:54 +0000 (UTC) Received: from d.earth.lavabit.com (d.earth.lavabit.com [192.168.111.13]) by karen.lavabit.com (Postfix) with ESMTP id 5B8C911BA62; Sat, 15 May 2010 18:02:53 -0500 (CDT) Received: from 192.168.0.6 (24.114.252.231) by lavabit.com with ESMTP id MV754Q0F95ML; Sat, 15 May 2010 18:02:53 -0500 References: <201005152118.o4FLIF8E093555@svn.freebsd.org> In-Reply-To: <201005152118.o4FLIF8E093555@svn.freebsd.org> Mime-Version: 1.0 (Apple Message framework v1078) Content-Type: text/plain; charset=us-ascii Message-Id: <4C04B013-9922-4934-AD3B-88C283FCC968@FreeBSD.org> Content-Transfer-Encoding: quoted-printable From: Rui Paulo Date: Sat, 15 May 2010 19:02:51 -0400 To: Weongyo Jeong X-Mailer: Apple Mail (2.1078) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r208120 - head/sys/dev/bwn X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 May 2010 23:02:55 -0000 On 15 May 2010, at 17:18, Weongyo Jeong wrote: > Author: weongyo > Date: Sat May 15 21:18:15 2010 > New Revision: 208120 > URL: http://svn.freebsd.org/changeset/base/208120 >=20 > Log: > - fixes a bug that it didn't initialize the ratectl after = association; > so ni_txrate returned 0 which is a invalid result. > - The fourth argument of ieee80211_ratectl_tx_complete() could be not > NULL. >=20 Thanks! > Reported by: Gustau P?rez > Tested by: Gustau P?rez , > Ian FREISLICH > MFC after: 3 days >=20 > Modified: > head/sys/dev/bwn/if_bwn.c >=20 > Modified: head/sys/dev/bwn/if_bwn.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/dev/bwn/if_bwn.c Sat May 15 20:26:10 2010 = (r208119) > +++ head/sys/dev/bwn/if_bwn.c Sat May 15 21:18:15 2010 = (r208120) > @@ -8329,6 +8329,7 @@ bwn_phy_reset(struct bwn_mac *mac) > static int > bwn_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, = int arg) > { > + const struct ieee80211_txparam *tp; > struct bwn_vap *bvp =3D BWN_VAP(vap); > struct ieee80211com *ic=3D vap->iv_ic; > struct ifnet *ifp =3D ic->ic_ifp; > @@ -8377,6 +8378,11 @@ bwn_newstate(struct ieee80211vap *vap, e > bwn_set_pretbtt(mac); > bwn_spu_setdelay(mac, 0); > bwn_set_macaddr(mac); > + > + /* Initializes ratectl for a node. */ > + tp =3D = &vap->iv_txparms[ieee80211_chan2mode(ic->ic_curchan)]; > + if (tp->ucastrate =3D=3D IEEE80211_FIXED_RATE_NONE) > + ieee80211_ratectl_node_init(vap->iv_bss); > } >=20 > BWN_UNLOCK(sc); > @@ -8994,7 +9000,7 @@ bwn_handle_txeof(struct bwn_mac *mac, co > struct bwn_stats *stats =3D &mac->mac_stats; > struct ieee80211_node *ni; > struct ieee80211vap *vap; > - int slot; > + int retrycnt =3D 0, slot; >=20 > BWN_ASSERT_LOCKED(mac->mac_sc); >=20 > @@ -9027,7 +9033,7 @@ bwn_handle_txeof(struct bwn_mac *mac, co > status->ack ? > = IEEE80211_RATECTL_TX_SUCCESS : > = IEEE80211_RATECTL_TX_FAILURE, > - NULL, 0); > + &retrycnt, 0); > break; > } > slot =3D bwn_dma_nextslot(dr, slot); > @@ -9048,7 +9054,7 @@ bwn_handle_txeof(struct bwn_mac *mac, co > status->ack ? > IEEE80211_RATECTL_TX_SUCCESS : > IEEE80211_RATECTL_TX_FAILURE, > - NULL, 0); > + &retrycnt, 0); > } > bwn_pio_handle_txeof(mac, status); > } >=20 > = __________________________________________________________________________= __________ > Use the link below to report this message as spam. > https://lavabit.com/apps/teacher?sig=3D1097658&key=3D888213324 > = __________________________________________________________________________= __________ -- Rui Paulo