From owner-svn-src-all@FreeBSD.ORG  Thu Mar  3 20:42:00 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 2AD2C106564A;
	Thu,  3 Mar 2011 20:42:00 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1954E8FC0A;
	Thu,  3 Mar 2011 20:42:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p23Kfx46073610;
	Thu, 3 Mar 2011 20:42:00 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p23Kfxb5073608;
	Thu, 3 Mar 2011 20:41:59 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201103032041.p23Kfxb5073608@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Thu, 3 Mar 2011 20:41:59 +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: r219252 - head/sys/dev/ath/ath_rate/sample
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: Thu, 03 Mar 2011 20:42:00 -0000

Author: adrian
Date: Thu Mar  3 20:41:59 2011
New Revision: 219252
URL: http://svn.freebsd.org/changeset/base/219252

Log:
  The sample rate module currently does the slightly wrong thing when
  determining whether to use MRR or not.
  
  It uses the 11g protection mode when calculating 11n related stuff, rather
  than checking the 11n protection mode.
  
  Furthermore, the 11n chipsets can quite happily handle multi-rate retry w/
  protection; the TX path and rate control modules need to be taught about
  that.

Modified:
  head/sys/dev/ath/ath_rate/sample/sample.c

Modified: head/sys/dev/ath/ath_rate/sample/sample.c
==============================================================================
--- head/sys/dev/ath/ath_rate/sample/sample.c	Thu Mar  3 20:14:00 2011	(r219251)
+++ head/sys/dev/ath/ath_rate/sample/sample.c	Thu Mar  3 20:41:59 2011	(r219252)
@@ -273,6 +273,7 @@ ath_rate_findrate(struct ath_softc *sc, 
 		goto done;
 	}
 
+	/* XXX TODO: this doesn't know about 11gn vs 11g protection; teach it */
 	mrr = sc->sc_mrretry && !(ic->ic_flags & IEEE80211_F_USEPROT);
 
 	best_rix = pick_best_rate(sn, rt, size_bin, !mrr);