From owner-svn-src-head@FreeBSD.ORG  Mon Oct 27 17:12:41 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
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 941831065679;
	Mon, 27 Oct 2008 17:12:41 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 82ECE8FC16;
	Mon, 27 Oct 2008 17:12:41 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9RHCfMK046330;
	Mon, 27 Oct 2008 17:12:41 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9RHCfH5046328;
	Mon, 27 Oct 2008 17:12:41 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200810271712.m9RHCfH5046328@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Mon, 27 Oct 2008 17:12:41 +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: r184349 - head/sys/dev/ath
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
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Oct 2008 17:12:41 -0000

Author: sam
Date: Mon Oct 27 17:12:41 2008
New Revision: 184349
URL: http://svn.freebsd.org/changeset/base/184349

Log:
  intercept IEEE80211_IOC_TXPOWER and service tx power changes immediately

Modified:
  head/sys/dev/ath/if_ath.c

Modified: head/sys/dev/ath/if_ath.c
==============================================================================
--- head/sys/dev/ath/if_ath.c	Mon Oct 27 17:10:21 2008	(r184348)
+++ head/sys/dev/ath/if_ath.c	Mon Oct 27 17:12:41 2008	(r184349)
@@ -1566,7 +1566,23 @@ ath_reset(struct ifnet *ifp)
 static int
 ath_reset_vap(struct ieee80211vap *vap, u_long cmd)
 {
-	return ath_reset(vap->iv_ic->ic_ifp);
+	struct ieee80211com *ic = vap->iv_ic;
+	struct ifnet *ifp = ic->ic_ifp;
+	struct ath_softc *sc = ifp->if_softc;
+	struct ath_hal *ah = sc->sc_ah;
+
+	switch (cmd) {
+	case IEEE80211_IOC_TXPOWER:
+		/*
+		 * If per-packet TPC is enabled, then we have nothing
+		 * to do; otherwise we need to force the global limit.
+		 * All this can happen directly; no need to reset.
+		 */
+		if (!ath_hal_gettpc(ah))
+			ath_hal_settxpowlimit(ah, ic->ic_txpowlimit);
+		return 0;
+	}
+	return ath_reset(ifp);
 }
 
 static int