From owner-svn-src-head@FreeBSD.ORG  Wed Aug 20 09:10:03 2014
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 C4F5450D;
 Wed, 20 Aug 2014 09:10:03 +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 B08F231CF;
 Wed, 20 Aug 2014 09:10:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7K9A3m8087769;
 Wed, 20 Aug 2014 09:10:03 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7K9A348087768;
 Wed, 20 Aug 2014 09:10:03 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201408200910.s7K9A348087768@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: adrian set sender to
 adrian@FreeBSD.org using -f
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Wed, 20 Aug 2014 09:10:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270206 - head/sys/net80211
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.18-1
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: Wed, 20 Aug 2014 09:10:03 -0000

Author: adrian
Date: Wed Aug 20 09:10:03 2014
New Revision: 270206
URL: http://svnweb.freebsd.org/changeset/base/270206

Log:
  After much toying around with this AMRR initial rate stuff,
  I've decided that for 11n rates it's best to start (very) low and work
  our way up.
  
  So, from now on, the initial rate for AMRR 11n is MCS4.
  It doesn't try MCS12 or MCS20 - at low signal strengths those don't
  work very well at all.
  
  AMRR will step the rate control up over time if things work out better.
  
  Tested:
  
  * Intel 5100
  * Intel 5300 (using local diffs to test out 3x3 stream support)

Modified:
  head/sys/net80211/ieee80211_amrr.c

Modified: head/sys/net80211/ieee80211_amrr.c
==============================================================================
--- head/sys/net80211/ieee80211_amrr.c	Wed Aug 20 08:24:37 2014	(r270205)
+++ head/sys/net80211/ieee80211_amrr.c	Wed Aug 20 09:10:03 2014	(r270206)
@@ -195,12 +195,13 @@ amrr_node_init(struct ieee80211_node *ni
 		rate &= IEEE80211_RATE_VAL;
 
 	/* pick initial rate from the rateset - HT or otherwise */
+	/* Pick something low that's likely to succeed */
 	for (amn->amn_rix = rs->rs_nrates - 1; amn->amn_rix > 0;
 	    amn->amn_rix--) {
 		/* legacy - anything < 36mbit, stop searching */
-		/* 11n - stop at MCS4 / MCS12 / MCS28 */
+		/* 11n - stop at MCS4 */
 		if (amrr_node_is_11n(ni)) {
-			if ((rs->rs_rates[amn->amn_rix] & 0x7) < 4)
+			if ((rs->rs_rates[amn->amn_rix] & 0x1f) < 4)
 				break;
 		} else if ((rs->rs_rates[amn->amn_rix] & IEEE80211_RATE_VAL) <= 72)
 			break;