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

[ccqin at FreeBSD.org]

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

Log:
   For pre-802.11n, clear rts/cts flag of retries 1, 2, 3. If retry 0 enable rts/cts, blank tries 1, 2, 3.

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 02:37:40 2013	(r254863)
+++ soc2013/ccqin/head/sys/net80211/ieee80211_ratectl.h	Wed Jul 17 03:02:32 2013	(r254864)
@@ -118,18 +118,17 @@
 {
 	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 */
-	for (i = 0; i < IEEE80211_RATECTL_NUM && rc[i].flags & IEEE80211_RATECTL_RTSCTS_FLAG; i++)
+	if (!(ic->ic_htcaps & IEEE80211_HTC_HT))
 	{
-		if (!(ic->ic_htcaps & IEEE80211_HTC_HT))
-		{
+		if (rc[0].flags & IEEE80211_RATECTL_RTSCTS_FLAG)
 			rc[1].tries = rc[2].tries = rc[3].tries = 0;
-			break;
-		}
+		rc[1].flags &= ~IEEE80211_RATECTL_RTSCTS_FLAG; 
+		rc[2].flags &= ~IEEE80211_RATECTL_RTSCTS_FLAG; 
+		rc[3].flags &= ~IEEE80211_RATECTL_RTSCTS_FLAG; 
 	}
 }