From owner-svn-src-head@FreeBSD.ORG Wed Apr 7 17:46:09 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 14E2F106567C; Wed, 7 Apr 2010 17:46:09 +0000 (UTC) (envelope-from rpaulo@gmail.com) Received: from fg-out-1718.google.com (fg-out-1718.google.com [72.14.220.155]) by mx1.freebsd.org (Postfix) with ESMTP id 10BDE8FC1A; Wed, 7 Apr 2010 17:46:07 +0000 (UTC) Received: by fg-out-1718.google.com with SMTP id l26so1500160fgb.13 for ; Wed, 07 Apr 2010 10:46:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:subject:mime-version :content-type:from:in-reply-to:date:cc:content-transfer-encoding :message-id:references:to:x-mailer; bh=6fkfVUeEUgMl06X+9zefJPnpYAy7QPeLNXVAwqMDyNU=; b=lNaTrks8gJqolLfh08WOJGbqN3rZVckl4hn44Ks8P8/kjeecjYFqR43j4XNDRznFeC a8yHUOfOZBsDcSJOQgtNrkYpI4k0aPweAJei1hCCw+NP91yp3eDm7ICD8u5bYQ9issxu 8MzU+gztpt0La00qIRn/BtUz3dHitAknGle8Q= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:subject:mime-version:content-type:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to:x-mailer; b=c8ev9HP/t4zYoT3xjXBsEwXP9m48wenDK6VV2jx7/AZo7UEcpLdoUxfY8A2jQiOT0r D6qLXWYcVT4QvOI8VgDrVf/GjY9P1Cy/kZgeAWjqM33YjKASC5i0L0Ffj4Y9C7JdrHoX mWA6DrnHTGnojAieTuoz/HucG+roUL/W/bsTE= Received: by 10.87.35.9 with SMTP id n9mr1004599fgj.45.1270662366906; Wed, 07 Apr 2010 10:46:06 -0700 (PDT) Received: from [10.0.10.2] (54.81.54.77.rev.vodafone.pt [77.54.81.54]) by mx.google.com with ESMTPS id 16sm9657382fxm.4.2010.04.07.10.46.05 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 07 Apr 2010 10:46:06 -0700 (PDT) Sender: Rui Paulo Mime-Version: 1.0 (Apple Message framework v1078) Content-Type: text/plain; charset=us-ascii From: Rui Paulo In-Reply-To: <1270662144.74915.108.camel@buffy.york.ac.uk> Date: Wed, 7 Apr 2010 18:46:03 +0100 Content-Transfer-Encoding: 7bit Message-Id: References: <201004071529.o37FTDi0035619@svn.freebsd.org> <1270662144.74915.108.camel@buffy.york.ac.uk> To: Gavin Atkinson 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: 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:46:09 -0000 On 7 Apr 2010, at 18:42, Gavin Atkinson wrote: > 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 >> >> 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) It can be MFC'ed but not as-is. > > Also... > >> @@ -3393,8 +3368,8 @@ _bwi_txeof(struct bwi_softc *sc, uint16_ >> bus_dmamap_unload(sc->sc_buf_dtag, tb->tb_dmap); >> >> ni = tb->tb_ni; >> + vap = ni->ni_vap; >> if (tb->tb_ni != NULL) { >> - struct bwi_node *bn = (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 = NULL; >> ni = data->ni; >> data->ni = NULL; >> + vap = ni->ni_vap; >> >> /* if no frame has been sent, ignore */ >> if (ni == NULL) >> continue; >> >> - rn = RT2661_NODE(ni); >> - > > Same here. Either we'll panic, or the test for (ni == NULL) isn't > needed. Right, this needs to be moved down. > >> @@ -1022,6 +1008,7 @@ rt2560_tx_intr(struct rt2560_softc *sc) >> data->m = NULL; >> ieee80211_free_node(data->ni); >> data->ni = NULL; >> + ni = NULL; >> >> /* descriptor is no longer valid */ >> desc->flags &= ~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. I'll remove it. > >> Index: head/sys/dev/usb/wlan/if_urtw.c >> =================================================================== >> --- 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 >> >> SYSCTL_NODE(_hw_usb, OID_AUTO, urtw, CTLFLAG_RW, 0, "USB Realtek 8187L"); >> +#define URTW_DEBUG >> #ifdef URTW_DEBUG >> int urtw_debug = 0; >> SYSCTL_INT(_hw_usb_urtw, OID_AUTO, debug, CTLFLAG_RW, &urtw_debug, 0, > > Is this change intentional? No. Regards, -- Rui Paulo