From owner-svn-src-all@FreeBSD.ORG  Sun May  8 11:01:53 2011
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 63927106564A;
	Sun,  8 May 2011 11:01:53 +0000 (UTC)
	(envelope-from bschmidt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 563948FC08;
	Sun,  8 May 2011 11:01:53 +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 p48B1rH9042739;
	Sun, 8 May 2011 11:01:53 GMT (envelope-from bschmidt@svn.freebsd.org)
Received: (from bschmidt@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p48B1rKj042737;
	Sun, 8 May 2011 11:01:53 GMT (envelope-from bschmidt@svn.freebsd.org)
Message-Id: <201105081101.p48B1rKj042737@svn.freebsd.org>
From: Bernhard Schmidt <bschmidt@FreeBSD.org>
Date: Sun, 8 May 2011 11:01:53 +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: r221640 - head/sys/dev/iwn
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: Sun, 08 May 2011 11:01:53 -0000

Author: bschmidt
Date: Sun May  8 11:01:53 2011
New Revision: 221640
URL: http://svn.freebsd.org/changeset/base/221640

Log:
  Disable background scan support for 4965 adapters.
  
  On legacy channels every once in a while the firmware throws a SYSASSERT
  on line 208. On HT channels though this does always happen and I'm not
  aware of any workaround currently.

Modified:
  head/sys/dev/iwn/if_iwn.c

Modified: head/sys/dev/iwn/if_iwn.c
==============================================================================
--- head/sys/dev/iwn/if_iwn.c	Sun May  8 10:57:44 2011	(r221639)
+++ head/sys/dev/iwn/if_iwn.c	Sun May  8 11:01:53 2011	(r221640)
@@ -584,12 +584,14 @@ iwn_attach(device_t dev)
 		| IEEE80211_C_SHSLOT		/* short slot time supported */
 		| IEEE80211_C_WPA
 		| IEEE80211_C_SHPREAMBLE	/* short preamble supported */
-		| IEEE80211_C_BGSCAN		/* background scanning */
 #if 0
 		| IEEE80211_C_IBSS		/* ibss/adhoc mode */
 #endif
 		| IEEE80211_C_WME		/* WME */
 		;
+	if (sc->hw_type != IWN_HW_REV_TYPE_4965)
+		ic->ic_caps |= IEEE80211_C_BGSCAN; /* background scanning */
+
 #if 0	/* HT */
 	/* XXX disable until HT channel setup works */
 	ic->ic_htcaps =