socsvn commit: r254862 - soc2013/ccqin/head/sys/net80211

[ccqin at FreeBSD.org]

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