Date: Sat, 15 May 2010 19:02:51 -0400 From: Rui Paulo <rpaulo@FreeBSD.org> To: Weongyo Jeong <weongyo@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r208120 - head/sys/dev/bwn Message-ID: <4C04B013-9922-4934-AD3B-88C283FCC968@FreeBSD.org> In-Reply-To: <201005152118.o4FLIF8E093555@svn.freebsd.org> References: <201005152118.o4FLIF8E093555@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <gperez at entel.upc.edu> > Tested by: Gustau P?rez <gperez at entel.upc.edu>, > Ian FREISLICH <ianf at clue.co.za> > 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4C04B013-9922-4934-AD3B-88C283FCC968>