From owner-svn-src-head@FreeBSD.ORG  Tue Nov 12 05:08:25 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 31B336A2;
 Tue, 12 Nov 2013 05:08:25 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2110F3F4E;
 Tue, 12 Nov 2013 05:08:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAC58O4U080206;
 Tue, 12 Nov 2013 05:08:24 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAC58OKJ080205;
 Tue, 12 Nov 2013 05:08:24 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201311120508.rAC58OKJ080205@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Tue, 12 Nov 2013 05:08:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r258033 - 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-head@freebsd.org
X-Mailman-Version: 2.1.16
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/options/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: Tue, 12 Nov 2013 05:08:25 -0000

Author: adrian
Date: Tue Nov 12 05:08:24 2013
New Revision: 258033
URL: http://svnweb.freebsd.org/changeset/base/258033

Log:
  Grr. For some odd reason, setting this to a single antenna on my 5100
  (which is a 1x2 device) panics the firmware.
  
  But, for some 6xxx devices that require IWN_ANT_BC for the TX chainmask,
  the link quality entries need to represent _that_.
  
  So, revert this for now until I can figure out what is supposed to be
  going on.

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

Modified: head/sys/dev/iwn/if_iwn.c
==============================================================================
--- head/sys/dev/iwn/if_iwn.c	Tue Nov 12 05:00:18 2013	(r258032)
+++ head/sys/dev/iwn/if_iwn.c	Tue Nov 12 05:08:24 2013	(r258033)
@@ -4336,7 +4336,7 @@ iwn_set_link_quality(struct iwn_softc *s
 	memset(&linkq, 0, sizeof linkq);
 	linkq.id = wn->id;
 	linkq.antmsk_1stream = txant;
-	linkq.antmsk_2stream = sc->txchainmask;
+	linkq.antmsk_2stream = IWN_ANT_AB;
 	linkq.ampdu_max = 64;
 	linkq.ampdu_threshold = 3;
 	linkq.ampdu_limit = htole16(4000);	/* 4ms */