From owner-svn-src-head@FreeBSD.ORG Tue Aug 16 09:07:59 2011 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 C3AE5106566C; Tue, 16 Aug 2011 09:07:59 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B41C08FC0C; Tue, 16 Aug 2011 09:07:59 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p7G97xWd049698; Tue, 16 Aug 2011 09:07:59 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7G97xs7049696; Tue, 16 Aug 2011 09:07:59 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201108160907.p7G97xs7049696@svn.freebsd.org> From: Adrian Chadd Date: Tue, 16 Aug 2011 09:07:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r224907 - head/sys/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: Tue, 16 Aug 2011 09:07:59 -0000 Author: adrian Date: Tue Aug 16 09:07:59 2011 New Revision: 224907 URL: http://svn.freebsd.org/changeset/base/224907 Log: Fix BAR frame TX completion - successful transmission is indicated by a status of 0. Approved by: re (kib) Modified: head/sys/net80211/ieee80211_ht.c Modified: head/sys/net80211/ieee80211_ht.c ============================================================================== --- head/sys/net80211/ieee80211_ht.c Tue Aug 16 09:06:44 2011 (r224906) +++ head/sys/net80211/ieee80211_ht.c Tue Aug 16 09:07:59 2011 (r224907) @@ -2207,7 +2207,7 @@ bar_tx_complete(struct ieee80211_node *n callout_pending(&tap->txa_timer)) { struct ieee80211com *ic = ni->ni_ic; - if (status) /* ACK'd */ + if (status == 0) /* ACK'd */ bar_stop_timer(tap); ic->ic_bar_response(ni, tap, status); /* NB: just let timer expire so we pace requests */ @@ -2219,7 +2219,7 @@ ieee80211_bar_response(struct ieee80211_ struct ieee80211_tx_ampdu *tap, int status) { - if (status != 0) { /* got ACK */ + if (status == 0) { /* got ACK */ IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_11N, ni, "BAR moves BA win <%u:%u> (%u frames) txseq %u tid %u", tap->txa_start,