From owner-freebsd-wireless@FreeBSD.ORG  Mon Jun 11 07:10:09 2012
Return-Path: <owner-freebsd-wireless@FreeBSD.ORG>
Delivered-To: freebsd-wireless@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DE8C8106566B
	for <freebsd-wireless@hub.freebsd.org>;
	Mon, 11 Jun 2012 07:10:09 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id C53348FC08
	for <freebsd-wireless@hub.freebsd.org>;
	Mon, 11 Jun 2012 07:10:09 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q5B7A9Rs094278
	for <freebsd-wireless@freefall.freebsd.org>;
	Mon, 11 Jun 2012 07:10:09 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q5B7A9ZJ094277;
	Mon, 11 Jun 2012 07:10:09 GMT (envelope-from gnats)
Date: Mon, 11 Jun 2012 07:10:09 GMT
Message-Id: <201206110710.q5B7A9ZJ094277@freefall.freebsd.org>
To: freebsd-wireless@FreeBSD.org
From: dfilter@FreeBSD.ORG (dfilter service)
Cc: 
Subject: Re: kern/166190: commit references a PR
X-BeenThere: freebsd-wireless@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: dfilter service <dfilter@FreeBSD.ORG>
List-Id: "Discussions of 802.11 stack,
	tools device driver development." <freebsd-wireless.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-wireless>, 
	<mailto:freebsd-wireless-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-wireless>
List-Post: <mailto:freebsd-wireless@freebsd.org>
List-Help: <mailto:freebsd-wireless-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-wireless>, 
	<mailto:freebsd-wireless-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Jun 2012 07:10:09 -0000

The following reply was made to PR kern/166190; it has been noted by GNATS.

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/166190: commit references a PR
Date: Mon, 11 Jun 2012 07:08:55 +0000 (UTC)

 Author: adrian
 Date: Mon Jun 11 07:08:40 2012
 New Revision: 236874
 URL: http://svn.freebsd.org/changeset/base/236874
 
 Log:
   Finish undoing the previous commit - this part of the code is no longer
   required.
   
   PR:		kern/166190
 
 Modified:
   head/sys/dev/ath/if_ath_tx.c
 
 Modified: head/sys/dev/ath/if_ath_tx.c
 ==============================================================================
 --- head/sys/dev/ath/if_ath_tx.c	Mon Jun 11 07:06:49 2012	(r236873)
 +++ head/sys/dev/ath/if_ath_tx.c	Mon Jun 11 07:08:40 2012	(r236874)
 @@ -1518,18 +1518,15 @@ ath_tx_start(struct ath_softc *sc, struc
  		 * TID and thus mess with the BAW.
  		 */
  		seqno = ath_tx_tid_seqno_assign(sc, ni, bf, m0);
 +
 +		/*
 +		 * Don't add QoS NULL frames to the BAW.
 +		 */
  		if (IEEE80211_QOS_HAS_SEQ(wh) &&
  		    subtype != IEEE80211_FC0_SUBTYPE_QOS_NULL) {
  			bf->bf_state.bfs_dobaw = 1;
  		}
  		ATH_TXQ_UNLOCK(txq);
 -	} else {
 -		/* No AMPDU TX, we've been assigned a sequence number. */
 -		if (IEEE80211_QOS_HAS_SEQ(wh)) {
 -			/* XXX we should store the frag+seqno in bfs_seqno */
 -			bf->bf_state.bfs_seqno =
 -			    M_SEQNO_GET(m0) << IEEE80211_SEQ_SEQ_SHIFT;
 -		}
  	}
  
  	/*
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"