From owner-svn-src-user@FreeBSD.ORG  Wed Sep 21 06:35:05 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A3194106564A;
	Wed, 21 Sep 2011 06:35:05 +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 9429B8FC13;
	Wed, 21 Sep 2011 06:35:05 +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 p8L6Z5W3062679;
	Wed, 21 Sep 2011 06:35:05 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8L6Z5dh062677;
	Wed, 21 Sep 2011 06:35:05 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201109210635.p8L6Z5dh062677@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Wed, 21 Sep 2011 06:35:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r225711 -
	user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Sep 2011 06:35:05 -0000

Author: adrian
Date: Wed Sep 21 06:35:05 2011
New Revision: 225711
URL: http://svn.freebsd.org/changeset/base/225711

Log:
  Undo an autosleep hack that I never finished porting.
  I'll revisit this when it's time to do autosleep.

Modified:
  user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c

Modified: user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c
==============================================================================
--- user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c	Wed Sep 21 03:37:12 2011	(r225710)
+++ user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c	Wed Sep 21 06:35:05 2011	(r225711)
@@ -107,10 +107,10 @@ ar5416SetupRxDesc(struct ath_hal *ah, st
     uint32_t size, u_int flags)
 {
 	struct ar5416_desc *ads = AR5416DESC(ds);
-	HAL_CAPABILITIES *pCap = &AH_PRIVATE(ah)->ah_caps;
 
 	HALASSERT((size &~ AR_BufLen) == 0);
 
+	ads->ds_ctl0 = 0;	/* XXX just to be sure? -adrian */
 	ads->ds_ctl1 = size & AR_BufLen;
 	if (flags & HAL_RXDESC_INTREQ)
 		ads->ds_ctl1 |= AR_RxIntrReq;
@@ -119,8 +119,7 @@ ar5416SetupRxDesc(struct ath_hal *ah, st
 	ads->ds_rxstatus8 &= ~AR_RxDone;
 
 	/* clear the rest of the status fields */
-	if (! pCap->halAutoSleepSupport)
-        	OS_MEMZERO(&(ads->u), sizeof(ads->u));
+	OS_MEMZERO(&(ads->u), sizeof(ads->u));
 
 	return AH_TRUE;
 }