From owner-freebsd-wireless@FreeBSD.ORG Sat Sep 8 03:10:19 2012 Return-Path: Delivered-To: freebsd-wireless@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 690CC106564A for ; Sat, 8 Sep 2012 03:10:19 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-pb0-f54.google.com (mail-pb0-f54.google.com [209.85.160.54]) by mx1.freebsd.org (Postfix) with ESMTP id 3D0DA8FC12 for ; Sat, 8 Sep 2012 03:10:19 +0000 (UTC) Received: by pbbrp2 with SMTP id rp2so492515pbb.13 for ; Fri, 07 Sep 2012 20:10:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:content-type; bh=bRUKfCw3ChtjsRH1xk2PYmZ4D3n+qA7F2qXwpjoluzU=; b=bRhSHc+2k+JtZArM78RsKqG0DfmiVk+FbvkG+ftjm9ccxtcskx3ndN7K+bcefD9XB7 9KKdbeblUpAeaBOIPunV2pgdYiH0nZkGw2EVflHVZW8oyKnp3BjKUteDJP+tKYmPuYOg Mgdnvk2iKRZvRvu9xAhY1tR/u5ZoeYcvnxSximiUtFcapSsrSqiTPenYH3E6r50NgGS/ wr8WifeSKyjwN3b91Fj/+NYuNiMusKIdBp2eK+9MPLIyLbT4+tZ03GlZ3AOPNJ2vGzM2 CgRvtH1E31J99Yfqjne3DWGCHVno9n/6QHr7O31a/bYoUIhDo0IanlrkqXsX719T70W3 /Ibw== MIME-Version: 1.0 Received: by 10.68.129.131 with SMTP id nw3mr13247586pbb.43.1347073818136; Fri, 07 Sep 2012 20:10:18 -0700 (PDT) Sender: adrian.chadd@gmail.com Received: by 10.68.36.106 with HTTP; Fri, 7 Sep 2012 20:10:18 -0700 (PDT) In-Reply-To: <201209080256.q882u9fY007905@svn.freebsd.org> References: <201209080256.q882u9fY007905@svn.freebsd.org> Date: Fri, 7 Sep 2012 20:10:18 -0700 X-Google-Sender-Auth: x9G7G2_j8Qo8ZDXicYtSw2JiUt0 Message-ID: From: Adrian Chadd To: freebsd-wireless@freebsd.org Content-Type: text/plain; charset=ISO-8859-1 Subject: Fwd: svn commit: r240226 - head/sys/dev/ath 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: Sat, 08 Sep 2012 03:10:19 -0000 Hiya, If you run ath(4) on -HEAD with 11n you will definitely want to update. :-) Adrian ---------- Forwarded message ---------- From: Adrian Chadd Date: 7 September 2012 19:56 Subject: svn commit: r240226 - head/sys/dev/ath To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Author: adrian Date: Sat Sep 8 02:56:09 2012 New Revision: 240226 URL: http://svn.freebsd.org/changeset/base/240226 Log: Correctly mask out the RTS/CTS flags when forming aggregates. This had the side effect of clearing HAL_TXDESC_CLRDMASK for a bunch of frames, meaning they'd end up being potentially filtered if there were an error. This is fine in the previous world as they'd just be software retried but now that I'm working on filtered frames, these descriptors would be endlessly retried until another valid frame would come along that had CLRDMASK set. Modified: head/sys/dev/ath/if_ath_tx_ht.c Modified: head/sys/dev/ath/if_ath_tx_ht.c ============================================================================== --- head/sys/dev/ath/if_ath_tx_ht.c Sat Sep 8 02:41:50 2012 (r240225) +++ head/sys/dev/ath/if_ath_tx_ht.c Sat Sep 8 02:56:09 2012 (r240226) @@ -742,7 +742,7 @@ ath_tx_form_aggr(struct ath_softc *sc, s * subsequent frame with this config. */ bf->bf_state.bfs_txflags &= - (HAL_TXDESC_RTSENA | HAL_TXDESC_CTSENA); + ~ (HAL_TXDESC_RTSENA | HAL_TXDESC_CTSENA); bf->bf_state.bfs_txflags |= bf_first->bf_state.bfs_txflags & (HAL_TXDESC_RTSENA | HAL_TXDESC_CTSENA);