From owner-svn-src-head@FreeBSD.ORG Wed Apr 7 17:42:30 2010 Return-Path: Delivered-To: svn-src-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 88034106566C; Wed, 7 Apr 2010 17:42:30 +0000 (UTC) (envelope-from gavin@FreeBSD.org) Received: from mail-gw2.york.ac.uk (mail-gw2.york.ac.uk [144.32.128.247]) by mx1.freebsd.org (Postfix) with ESMTP id 36AA38FC2B; Wed, 7 Apr 2010 17:42:29 +0000 (UTC) Received: from mail-gw7.york.ac.uk (mail-gw7.york.ac.uk [144.32.129.30]) by mail-gw2.york.ac.uk (8.13.6/8.13.6) with ESMTP id o37HgQsf024375; Wed, 7 Apr 2010 18:42:26 +0100 (BST) Received: from buffy-128.york.ac.uk ([144.32.128.160] helo=buffy.york.ac.uk) by mail-gw7.york.ac.uk with esmtps (TLSv1:AES256-SHA:256) (Exim 4.68) (envelope-from ) id 1NzZGk-00036X-AA; Wed, 07 Apr 2010 18:42:26 +0100 Received: from buffy.york.ac.uk (localhost [127.0.0.1]) by buffy.york.ac.uk (8.14.3/8.14.3) with ESMTP id o37HgPkH080636; Wed, 7 Apr 2010 18:42:26 +0100 (BST) (envelope-from gavin@FreeBSD.org) Received: (from ga9@localhost) by buffy.york.ac.uk (8.14.3/8.14.3/Submit) id o37HgPqN080635; Wed, 7 Apr 2010 18:42:25 +0100 (BST) (envelope-from gavin@FreeBSD.org) X-Authentication-Warning: buffy.york.ac.uk: ga9 set sender to gavin@FreeBSD.org using -f From: Gavin Atkinson To: Rui Paulo In-Reply-To: <201004071529.o37FTDi0035619@svn.freebsd.org> References: <201004071529.o37FTDi0035619@svn.freebsd.org> Content-Type: text/plain; charset="ASCII" Content-Transfer-Encoding: quoted-printable Date: Wed, 07 Apr 2010 18:42:24 +0100 Message-ID: <1270662144.74915.108.camel@buffy.york.ac.uk> Mime-Version: 1.0 X-Mailer: Evolution 2.28.1 FreeBSD GNOME Team Port X-York-MailScanner: Found to be clean X-York-MailScanner-From: gavin@freebsd.org Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r206358 - in head/sys: conf dev/bwi dev/bwn dev/iwn dev/ral dev/usb/wlan dev/wpi modules/wlan net80211 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Apr 2010 17:42:30 -0000 On Wed, 2010-04-07 at 15:29 +0000, Rui Paulo wrote: > Author: rpaulo > Date: Wed Apr 7 15:29:13 2010 > New Revision: 206358 > URL: http://svn.freebsd.org/changeset/base/206358 >=20 > Log: > net80211 rate control framework (net80211 ratectl). This looks to be great work! Thanks for doing this. [...] > MFC after: 1 months The changes change KBI - I don't think it can be MFC'd as-is? (especially the sys/net80211/ieee80211_var.h changes) Also... > @@ -3393,8 +3368,8 @@ _bwi_txeof(struct bwi_softc *sc, uint16_ > bus_dmamap_unload(sc->sc_buf_dtag, tb->tb_dmap); > =20 > ni =3D tb->tb_ni; > + vap =3D ni->ni_vap; > if (tb->tb_ni !=3D NULL) { > - struct bwi_node *bn =3D (struct bwi_node *) tb->tb_ni; If (tb->tb_ni) can indeed be NULL here, we'll now panic. If not, there's no need for the conditional. > @@ -921,13 +900,12 @@ rt2661_tx_intr(struct rt2661_softc *sc) > data->m =3D NULL; > ni =3D data->ni; > data->ni =3D NULL; > + vap =3D ni->ni_vap; > =20 > /* if no frame has been sent, ignore */ > if (ni =3D=3D NULL) > continue; > =20 > - rn =3D RT2661_NODE(ni); > - Same here. Either we'll panic, or the test for (ni =3D=3D NULL) isn't needed. > @@ -1022,6 +1008,7 @@ rt2560_tx_intr(struct rt2560_softc *sc) > data->m =3D NULL; > ieee80211_free_node(data->ni); > data->ni =3D NULL; > + ni =3D NULL; >=20 > /* descriptor is no longer valid */ > desc->flags &=3D ~htole32(RT2560_TX_VALID); This seems unnecessary - we never read "ni" again. Either we fall out of the loop and exit the subroutine, or we go round the loop again and overwrite it. > Index: head/sys/dev/usb/wlan/if_urtw.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 > --- head/sys/dev/usb/wlan/if_urtw.c (revision 206357) > +++ head/sys/dev/usb/wlan/if_urtw.c (revision 206358) > @@ -62,6 +62,7 @@ __FBSDID("$FreeBSD$"); > #include >=20 > SYSCTL_NODE(_hw_usb, OID_AUTO, urtw, CTLFLAG_RW, 0, "USB Realtek 8187L")= ; > +#define URTW_DEBUG > #ifdef URTW_DEBUG > int urtw_debug =3D 0; > SYSCTL_INT(_hw_usb_urtw, OID_AUTO, debug, CTLFLAG_RW, &urtw_debug, 0, Is this change intentional? Thanks, Gavin