From owner-svn-src-head@FreeBSD.ORG  Fri Feb 20 22:05:08 2009
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 EEDED106566B;
	Fri, 20 Feb 2009 22:05:08 +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 DCB658FC14;
	Fri, 20 Feb 2009 22:05:08 +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 n1KM585b040165;
	Fri, 20 Feb 2009 22:05:08 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1KM58wY040164;
	Fri, 20 Feb 2009 22:05:08 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200902202205.n1KM58wY040164@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Fri, 20 Feb 2009 22:05:08 +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: r188865 - head/sys/dev/ath/ath_hal
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: Fri, 20 Feb 2009 22:05:09 -0000

Author: sam
Date: Fri Feb 20 22:05:08 2009
New Revision: 188865
URL: http://svn.freebsd.org/changeset/base/188865

Log:
  don't adjust core clk conversions for 1/2 and 1/4 rate channels; the
  mac runs at full speed so doing this breaks conversion for ifs parameters
  
  Submitted by:	Felix Fietkau <nbd@openwrt.org>

Modified:
  head/sys/dev/ath/ath_hal/ah.c

Modified: head/sys/dev/ath/ath_hal/ah.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ah.c	Fri Feb 20 21:57:05 2009	(r188864)
+++ head/sys/dev/ath/ath_hal/ah.c	Fri Feb 20 22:05:08 2009	(r188865)
@@ -266,10 +266,6 @@ ath_hal_mac_clks(struct ath_hal *ah, u_i
 		clks = usecs * CLOCK_RATE[ath_hal_chan2wmode(ah, c)];
 		if (IEEE80211_IS_CHAN_HT40(c))
 			clks <<= 1;
-		else if (IEEE80211_IS_CHAN_HALF(c))
-			clks >>= 1;
-		else if (IEEE80211_IS_CHAN_QUARTER(c))
-			clks >>= 2;
 	} else
 		clks = usecs * CLOCK_RATE[WIRELESS_MODE_11b];
 	return clks;
@@ -286,10 +282,6 @@ ath_hal_mac_usec(struct ath_hal *ah, u_i
 		usec = clks / CLOCK_RATE[ath_hal_chan2wmode(ah, c)];
 		if (IEEE80211_IS_CHAN_HT40(c))
 			usec >>= 1;
-		else if (IEEE80211_IS_CHAN_HALF(c))
-			usec <<= 1;
-		else if (IEEE80211_IS_CHAN_QUARTER(c))
-			usec <<= 2;
 	} else
 		usec = clks / CLOCK_RATE[WIRELESS_MODE_11b];
 	return usec;