From owner-freebsd-wireless@FreeBSD.ORG Tue Nov 1 03:15:25 2011 Return-Path: Delivered-To: freebsd-wireless@freebsd.org Received: from mx2.freebsd.org (mx2.freebsd.org [IPv6:2001:4f8:fff6::35]) by hub.freebsd.org (Postfix) with ESMTP id D2C2B106564A; Tue, 1 Nov 2011 03:15:25 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from 172-17-198-245.globalsuite.net (hub.freebsd.org [IPv6:2001:4f8:fff6::36]) by mx2.freebsd.org (Postfix) with ESMTP id C58DE14D9C9; Tue, 1 Nov 2011 03:15:14 +0000 (UTC) Message-ID: <4EAF6442.5020901@FreeBSD.org> Date: Mon, 31 Oct 2011 20:15:14 -0700 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:7.0.1) Gecko/20111001 Thunderbird/7.0.1 MIME-Version: 1.0 To: Adrian Chadd References: <4EAF18B2.9040909@FreeBSD.org> In-Reply-To: X-Enigmail-Version: undefined OpenPGP: id=1A1ABC84 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: freebsd-wireless@freebsd.org, freebsd-current Subject: Re: request: merging if_ath_tx branch to HEAD X-BeenThere: freebsd-wireless@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Discussions of 802.11 stack, tools device driver development." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Nov 2011 03:15:25 -0000 On 10/31/2011 17:22, Adrian Chadd wrote: > On 31 October 2011 14:52, Doug Barton wrote: > >>> The code is a bit messy and it's still a work in progress but I'd >>> rather tidy it up in -HEAD. Otherwise I'm stuck in the unfortunate >>> situation of having to keep merging between the if_ath_tx branch and >>> -HEAD. >> >> Is this work that is planned to be migrated to 9.0-RELEASE? If not, >> shouldn't it wait till after the release? > > Well, it depends on how long 9.0-RELEASE is going to take. If it's > going to take days, then sure I can wait. But if it's going to take > weeks, I'll likely _have_ the rest of the if_ath_tx missing pieces > done and ready for merge into 9.0. > > In any case, I do want to merge the ath 11n stuff into -9, so even if > it's not done by 9.0, it'll be done shortly after. Given that RC1 is already out, you should probably check with re@ first. -- Nothin' ever doesn't change, but nothin' changes much. -- OK Go Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/