From owner-freebsd-current@FreeBSD.ORG Sun Jun 3 22:19:44 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 48E6E16A421 for ; Sun, 3 Jun 2007 22:19:44 +0000 (UTC) (envelope-from lists@swaggi.com) Received: from swaggi.com (c-71-232-182-120.hsd1.ma.comcast.net [71.232.182.120]) by mx1.freebsd.org (Postfix) with ESMTP id 207BF13C45A for ; Sun, 3 Jun 2007 22:19:44 +0000 (UTC) (envelope-from lists@swaggi.com) Received: from localhost ([127.0.0.1] helo=swaggi.com) by swaggi.com with esmtp (Exim 4.66 (FreeBSD)) (envelope-from ) id 1HuxzH-00050J-DU; Sun, 03 Jun 2007 17:51:47 -0400 From: "Yuri Lukin" To: Sam Leffler Date: Sun, 3 Jun 2007 17:51:46 -0400 Message-Id: <20070603214845.M67914@swaggi.com> In-Reply-To: <46605C26.9090304@errno.com> References: <46605C26.9090304@errno.com> X-Mailer: swaggi.com MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 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: Sun, 03 Jun 2007 22:19:44 -0000 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? Thanks for the work - looking forward to vap support. Yuri