From owner-freebsd-current@FreeBSD.ORG Mon Jun 4 03:53:22 2007 Return-Path: X-Original-To: freebsd-current@freebsd.org Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0BD0616A400 for ; Mon, 4 Jun 2007 03:53:22 +0000 (UTC) (envelope-from sam@errno.com) Received: from ebb.errno.com (ebb.errno.com [69.12.149.25]) by mx1.freebsd.org (Postfix) with ESMTP id D74D213C448 for ; Mon, 4 Jun 2007 03:53:21 +0000 (UTC) (envelope-from sam@errno.com) Received: from sam-lefflers-powerbook-g4-15.local (sam@[10.0.0.178]) (authenticated bits=0) by ebb.errno.com (8.13.6/8.12.6) with ESMTP id l543rLRK015804 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 3 Jun 2007 20:53:21 -0700 (PDT) (envelope-from sam@errno.com) Message-ID: <46638CB3.6020206@errno.com> Date: Sun, 03 Jun 2007 20:53:23 -0700 From: Sam Leffler Organization: Errno Consulting User-Agent: Thunderbird 2.0.0.0 (Macintosh/20070326) MIME-Version: 1.0 To: Yuri Lukin References: <46605C26.9090304@errno.com> <20070603214845.M67914@swaggi.com> In-Reply-To: <20070603214845.M67914@swaggi.com> X-Enigmail-Version: 0.95.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: freebsd-current@freebsd.org Subject: Re: CFT: major wireless changes X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jun 2007 03:53:22 -0000 Yuri Lukin wrote: > On Fri, 01 Jun 2007 10:49:26 -0700, Sam Leffler wrote >> This patch against HEAD imports the work that's been sitting in the >> sam_wifi p4 branch: >> >> http://people.freebsd.org/~sam/sam_wifi-20070601.patch.gz >> >> To apply it do something like >> >> cd /usr/src >> gzcat sam_wifi-20070601.patch.gz | patch -p4 >> >> Expect one reject in sys/net80211/ieee80211_input.c.rej; it can be ignored. >> > > In addition to the reject cited above, I also got the following when patching > a snapshot from today: > > Hunk #91 failed at 5301. > 1 out of 109 hunks failed--saving rejects to sys/dev/ath/if_ath.c.rej > > *************** > *** 4599,4605 **** > * o notify the rate control algorithm > */ > sc->sc_imask &= ~(HAL_INT_SWBA | HAL_INT_BMISS); > - ath_hal_intrset(ah, sc->sc_imask &~ HAL_INT_GLOBAL); > /* XXX can't use taskqueue_drain 'cuz we're holding sc_mtx */ > taskqueue_drain(sc->sc_tq, &sc->sc_rxtask); > taskqueue_drain(sc->sc_tq, &sc->sc_rxorntask); > --- 5301,5307 ---- > * o notify the rate control algorithm > */ > sc->sc_imask &= ~(HAL_INT_SWBA | HAL_INT_BMISS); > + ath_intrset(sc, sc->sc_imask &~ HAL_INT_GLOBAL); > /* XXX can't use taskqueue_drain 'cuz we're holding sc_mtx */ > taskqueue_drain(sc->sc_tq, &sc->sc_rxtask); > taskqueue_drain(sc->sc_tq, &sc->sc_rxorntask); > > > I see there was a change made to if_ath.c in HEAD yesterday related to > taskqueue_drain. Is it safe to ignore this reject as well? This is because the driver changed after I generated the patch. It's unlikely to be a worry so long as you don't enable polling (which you should not as it was an experiment that won't go into cvs). > > Thanks for the work - looking forward to vap support. > > Yuri > > >