From owner-svn-src-user@FreeBSD.ORG  Mon Sep 12 14:23:28 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 54EAD106564A;
	Mon, 12 Sep 2011 14:23:28 +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 455A68FC0C;
	Mon, 12 Sep 2011 14:23:28 +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 p8CENSMC029618;
	Mon, 12 Sep 2011 14:23:28 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8CENSJo029616;
	Mon, 12 Sep 2011 14:23:28 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201109121423.p8CENSJo029616@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Mon, 12 Sep 2011 14:23:28 +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: r225509 - user/adrian/if_ath_tx/sys/dev/ath
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: Mon, 12 Sep 2011 14:23:28 -0000

Author: adrian
Date: Mon Sep 12 14:23:27 2011
New Revision: 225509
URL: http://svn.freebsd.org/changeset/base/225509

Log:
  HAL_INT_GLOBAL needs to keep being set here so SWBA can fire appropriately whilst
  the rest of the interrupts are disabled.
  
  This constant rewriting of the interrupt mask/enable registers seems a bit
  silly to me; I'll have to tidy it up at some point.
  
  Linux just toggles AR_IER (global interrupt enable) on/off - but it
  does deferred beacon processing, rather than doing it in interrupt
  context like we do.

Modified:
  user/adrian/if_ath_tx/sys/dev/ath/if_ath.c

Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath.c
==============================================================================
--- user/adrian/if_ath_tx/sys/dev/ath/if_ath.c	Mon Sep 12 14:21:06 2011	(r225508)
+++ user/adrian/if_ath_tx/sys/dev/ath/if_ath.c	Mon Sep 12 14:23:27 2011	(r225509)
@@ -1561,7 +1561,8 @@ ath_intr(void *arg)
 	 * moment, always leave that enabled.
 	 */
 	if (sched == 1) {
-		ath_hal_intrset(ah, (sc->sc_imask & HAL_INT_SWBA));
+		ath_hal_intrset(ah,
+		    (sc->sc_imask & (HAL_INT_SWBA | HAL_INT_GLOBAL)));
 		taskqueue_enqueue_fast(sc->sc_tq, &sc->sc_intrtask);
 	}
 }