From owner-svn-src-all@FreeBSD.ORG  Mon May 18 15:31:26 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DA41A1065674;
	Mon, 18 May 2009 15:31:26 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C8F608FC18;
	Mon, 18 May 2009 15:31:26 +0000 (UTC) (envelope-from imp@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 n4IFVQGF066184;
	Mon, 18 May 2009 15:31:26 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4IFVQmE066183;
	Mon, 18 May 2009 15:31:26 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200905181531.n4IFVQmE066183@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 18 May 2009 15:31:26 +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: r192306 - head/sys/dev/bwi
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 May 2009 15:31:27 -0000

Author: imp
Date: Mon May 18 15:31:26 2009
New Revision: 192306
URL: http://svn.freebsd.org/changeset/base/192306

Log:
  Fix a typo from the original driver.  We need to write ctrl2 into RF
  register 0x52, not ctrl1.  This appears to be a mistake in the bcm
  reverse engineering page, and has been corrected there.  Tracing
  through the code, this is more in keeping with the "documented"
  register. Sephe thinks it looks interesting and may be worth
  fixing. :)
  
  Submitted by:	ddkprog at yahoo com
  Reviewed by:	Sepherosa Ziehau

Modified:
  head/sys/dev/bwi/bwiphy.c

Modified: head/sys/dev/bwi/bwiphy.c
==============================================================================
--- head/sys/dev/bwi/bwiphy.c	Mon May 18 14:02:55 2009	(r192305)
+++ head/sys/dev/bwi/bwiphy.c	Mon May 18 15:31:26 2009	(r192306)
@@ -375,7 +375,7 @@ bwi_phy_init_11g(struct bwi_mac *mac)
 			RF_WRITE(mac, 0x52,
 				 (tpctl->tp_ctrl1 << 4) | tpctl->tp_ctrl2);
 		} else {
-			RF_FILT_SETBITS(mac, 0x52, 0xfff0, tpctl->tp_ctrl1);
+			RF_FILT_SETBITS(mac, 0x52, 0xfff0, tpctl->tp_ctrl2);
 		}
 
 		if (phy->phy_rev >= 6) {