From owner-svn-src-all@FreeBSD.ORG  Sat May 10 05:56:10 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C5A18879;
 Sat, 10 May 2014 05:56:10 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B37EE884;
 Sat, 10 May 2014 05:56:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4A5uAZi025279;
 Sat, 10 May 2014 05:56:10 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4A5uA9U025278;
 Sat, 10 May 2014 05:56:10 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201405100556.s4A5uA9U025278@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sat, 10 May 2014 05:56:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r265803 - head/sys/dev/iwn
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
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/options/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: Sat, 10 May 2014 05:56:10 -0000

Author: adrian
Date: Sat May 10 05:56:10 2014
New Revision: 265803
URL: http://svnweb.freebsd.org/changeset/base/265803

Log:
  Fix the required calibration flags for the Centrino 1000 NIC.

Modified:
  head/sys/dev/iwn/if_iwn_chip_cfg.h

Modified: head/sys/dev/iwn/if_iwn_chip_cfg.h
==============================================================================
--- head/sys/dev/iwn/if_iwn_chip_cfg.h	Sat May 10 05:16:28 2014	(r265802)
+++ head/sys/dev/iwn/if_iwn_chip_cfg.h	Sat May 10 05:56:10 2014	(r265803)
@@ -219,14 +219,16 @@ static const struct iwn_base_params iwn1
 	.regulatory_bands = iwn5000_regulatory_bands,
 	.enhanced_TX_power = false,
 	.calib_need =
-	    ( IWN_FLG_NEED_PHY_CALIB_DC
-	    | IWN_FLG_NEED_PHY_CALIB_LO
+	    ( IWN_FLG_NEED_PHY_CALIB_LO
+	    | IWN_FLG_NEED_PHY_CALIB_TX_IQ_PERIODIC
 	    | IWN_FLG_NEED_PHY_CALIB_TX_IQ
-	    | IWN_FLG_NEED_PHY_CALIB_BASE_BAND ),
+	    | IWN_FLG_NEED_PHY_CALIB_BASE_BAND
+	    ),
 	.support_hostap = false,
 	.no_multi_vaps = true,
 	.additional_gp_drv_bit = IWN_GP_DRIVER_NONE,
-	.bt_mode = IWN_BT_NONE,
+	/* XXX 1000 - no BT */
+	.bt_mode = IWN_BT_SIMPLE,
 	.plcp_err_threshold = IWN_PLCP_ERR_EXT_LONG_THRESHOLD,
 };
 static const struct iwn_base_params iwn_6000_base_params = {