From owner-svn-soc-all@FreeBSD.ORG  Wed Jul 17 02:19:45 2013
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 906A8B3
 for <svn-soc-all@FreeBSD.org>; Wed, 17 Jul 2013 02:19:45 +0000 (UTC)
 (envelope-from ccqin@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 by mx1.freebsd.org (Postfix) with ESMTP id 826E3CDE
 for <svn-soc-all@FreeBSD.org>; Wed, 17 Jul 2013 02:19:45 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6H2JjM6028124
 for <svn-soc-all@FreeBSD.org>; Wed, 17 Jul 2013 02:19:45 GMT
 (envelope-from ccqin@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r6H2JjcT028113
 for svn-soc-all@FreeBSD.org; Wed, 17 Jul 2013 02:19:45 GMT
 (envelope-from ccqin@FreeBSD.org)
Date: Wed, 17 Jul 2013 02:19:45 GMT
Message-Id: <201307170219.r6H2JjcT028113@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 ccqin@FreeBSD.org using -f
From: ccqin@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r254862 - soc2013/ccqin/head/sys/net80211
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 17 Jul 2013 02:19:45 -0000

Author: ccqin
Date: Wed Jul 17 02:19:45 2013
New Revision: 254862
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=254862

Log:
  Fix some rate option's logic.

Modified:
  soc2013/ccqin/head/sys/net80211/ieee80211_ratectl.h

Modified: soc2013/ccqin/head/sys/net80211/ieee80211_ratectl.h
==============================================================================
--- soc2013/ccqin/head/sys/net80211/ieee80211_ratectl.h	Wed Jul 17 01:34:25 2013	(r254861)
+++ soc2013/ccqin/head/sys/net80211/ieee80211_ratectl.h	Wed Jul 17 02:19:45 2013	(r254862)
@@ -118,12 +118,19 @@
 {
 	const struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211com *ic = vap->iv_ic; 
+	int i;
 
 	vap->iv_rate->ir_rates(ni, rc, shortPreamble, frameLen);
 
 	/* if enable rts/cts and is pre-802.11n, blank tries 1, 2, 3 */
-	if ((rc[0].flags & IEEE80211_RATECTL_RTSCTS_FLAG) && !(ic->ic_htcaps & IEEE80211_HTC_HT))
-		rc[1].tries = rc[2].tries = rc[3].tries = 0;
+	for (i = 0; i < IEEE80211_RATECTL_NUM && rc[i].flags & IEEE80211_RATECTL_RTSCTS_FLAG; i++)
+	{
+		if (!(ic->ic_htcaps & IEEE80211_HTC_HT))
+		{
+			rc[1].tries = rc[2].tries = rc[3].tries = 0;
+			break;
+		}
+	}
 }
 
 static void __inline