PERFORCE change 118562 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=118562

Change 118562 by sam at sam_ebb on 2007/04/22 05:17:02

	add missing array entries for static turbo mode

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#53 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_proto.c#53 (text+ko) ====

@@ -561,6 +561,7 @@
 	{ 3, 5, 7,   0, 0 },	/* IEEE80211_MODE_FH */
 	{ 2, 3, 5,   0, 0 },	/* IEEE80211_MODE_TURBO_A */
 	{ 2, 3, 5,   0, 0 },	/* IEEE80211_MODE_TURBO_G */
+	{ 2, 3, 5,   0, 0 },	/* IEEE80211_MODE_STURBO_A */
 };
 static const struct phyParamType phyParamForAC_BK[IEEE80211_MODE_MAX] = {
 	{ 7, 4, 10,  0, 0 },	/* IEEE80211_MODE_AUTO */
@@ -570,6 +571,7 @@
 	{ 7, 5, 10,  0, 0 },	/* IEEE80211_MODE_FH */
 	{ 7, 3, 10,  0, 0 },	/* IEEE80211_MODE_TURBO_A */
 	{ 7, 3, 10,  0, 0 },	/* IEEE80211_MODE_TURBO_G */
+	{ 7, 3, 10,  0, 0 },	/* IEEE80211_MODE_STURBO_A */
 };
 static const struct phyParamType phyParamForAC_VI[IEEE80211_MODE_MAX] = {
 	{ 1, 3, 4,  94, 0 },	/* IEEE80211_MODE_AUTO */
@@ -579,6 +581,7 @@
 	{ 1, 4, 5, 188, 0 },	/* IEEE80211_MODE_FH */
 	{ 1, 2, 3,  94, 0 },	/* IEEE80211_MODE_TURBO_A */
 	{ 1, 2, 3,  94, 0 },	/* IEEE80211_MODE_TURBO_G */
+	{ 1, 2, 3,  94, 0 },	/* IEEE80211_MODE_STURBO_A */
 };
 static const struct phyParamType phyParamForAC_VO[IEEE80211_MODE_MAX] = {
 	{ 1, 2, 3,  47, 0 },	/* IEEE80211_MODE_AUTO */
@@ -588,6 +591,7 @@
 	{ 1, 3, 4, 102, 0 },	/* IEEE80211_MODE_FH */
 	{ 1, 2, 2,  47, 0 },	/* IEEE80211_MODE_TURBO_A */
 	{ 1, 2, 2,  47, 0 },	/* IEEE80211_MODE_TURBO_G */
+	{ 1, 2, 2,  47, 0 },	/* IEEE80211_MODE_STURBO_A */
 };
 
 static const struct phyParamType bssPhyParamForAC_BE[IEEE80211_MODE_MAX] = {
@@ -598,6 +602,7 @@
 	{ 3, 5, 10,  0, 0 },	/* IEEE80211_MODE_FH */
 	{ 2, 3, 10,  0, 0 },	/* IEEE80211_MODE_TURBO_A */
 	{ 2, 3, 10,  0, 0 },	/* IEEE80211_MODE_TURBO_G */
+	{ 2, 3, 10,  0, 0 },	/* IEEE80211_MODE_STURBO_A */
 };
 static const struct phyParamType bssPhyParamForAC_VI[IEEE80211_MODE_MAX] = {
 	{ 2, 3, 4,  94, 0 },	/* IEEE80211_MODE_AUTO */
@@ -607,6 +612,7 @@
 	{ 2, 4, 5, 188, 0 },	/* IEEE80211_MODE_FH */
 	{ 2, 2, 3,  94, 0 },	/* IEEE80211_MODE_TURBO_A */
 	{ 2, 2, 3,  94, 0 },	/* IEEE80211_MODE_TURBO_G */
+	{ 2, 2, 3,  94, 0 },	/* IEEE80211_MODE_STURBO_A */
 };
 static const struct phyParamType bssPhyParamForAC_VO[IEEE80211_MODE_MAX] = {
 	{ 2, 2, 3,  47, 0 },	/* IEEE80211_MODE_AUTO */
@@ -616,6 +622,7 @@
 	{ 2, 3, 4, 102, 0 },	/* IEEE80211_MODE_FH */
 	{ 1, 2, 2,  47, 0 },	/* IEEE80211_MODE_TURBO_A */
 	{ 1, 2, 2,  47, 0 },	/* IEEE80211_MODE_TURBO_G */
+	{ 1, 2, 2,  47, 0 },	/* IEEE80211_MODE_STURBO_A */
 };
 
 void
@@ -732,6 +739,7 @@
 		{ 2, 5, 10, 64, 0 },	/* IEEE80211_MODE_FH */
 		{ 1, 3, 10, 64, 0 },	/* IEEE80211_MODE_TURBO_A */
 		{ 1, 3, 10, 64, 0 },	/* IEEE80211_MODE_TURBO_G */
+		{ 1, 3, 10, 64, 0 },	/* IEEE80211_MODE_STURBO_A */
 	};
 	struct ieee80211_wme_state *wme = &ic->ic_wme;
 	const struct wmeParams *wmep;
@@ -813,6 +821,7 @@
               		4,	/* IEEE80211_MODE_FH */
               		3,	/* IEEE80211_MODE_TURBO_A */
               		3,	/* IEEE80211_MODE_TURBO_G */
+              		3,	/* IEEE80211_MODE_STURBO_A */
 		};
 		chanp = &wme->wme_chanParams.cap_wmeParams[WME_AC_BE];
 		bssp = &wme->wme_bssChanParams.cap_wmeParams[WME_AC_BE];