Add modes for 1/2 and 1/4-width channels so we have separate roaming

and xmit parameters.  This makes it possible to use tdma on fractional
channels.
o add IEEE80211_MODE_HALF and IEEE80211_MODE_QUARTER; note these are
  band-agnostic (may need revisiting)
o setup all default rates in ic_sup_rates instead of doing it only
  for active modes; we need these to calculate the default tx parameters
  which are not recalculated after a regulatory update (can't just
  recalculate after installing a new channel list because we might
  clobber user settings)
o remove special case code in ieee80211_get_suprates; this is now
  a candidate for an inline or removal
o add various entries for new modes (roaming+tx params, wme, rate
  mapping, scan set setup, country ie construction, tdma, basic rates)

Note these modes are intentionally not visible through if_media.

1 files changed, 20 insertions, 0 deletions

diff --git a/sys/net80211/ieee80211_proto.c b/sys/net80211/ieee80211_proto.c
index 5d9b747..a9d5324 100644
--- a/sys/net80211/ieee80211_proto.c
+++ b/sys/net80211/ieee80211_proto.c
@@ -662,6 +662,8 @@ setbasicrates(struct ieee80211_rateset *rs,
 	    [IEEE80211_MODE_TURBO_A]	= { 3, { 12, 24, 48 } },
 	    [IEEE80211_MODE_TURBO_G]	= { 4, { 2, 4, 11, 22 } },
 	    [IEEE80211_MODE_STURBO_A]	= { 3, { 12, 24, 48 } },
+	    [IEEE80211_MODE_HALF]	= { 3, { 6, 12, 24 } },
+	    [IEEE80211_MODE_QUARTER]	= { 3, { 3, 6, 12 } },
 	    [IEEE80211_MODE_11NA]	= { 3, { 12, 24, 48 } },
 					    /* NB: mixed b/g */
 	    [IEEE80211_MODE_11NG]	= { 4, { 2, 4, 11, 22 } },
@@ -725,6 +727,8 @@ static const struct phyParamType phyParamForAC_BE[IEEE80211_MODE_MAX] = {
 	[IEEE80211_MODE_TURBO_A]= { 2, 3,  5,  0, 0 },
 	[IEEE80211_MODE_TURBO_G]= { 2, 3,  5,  0, 0 },
 	[IEEE80211_MODE_STURBO_A]={ 2, 3,  5,  0, 0 },
+	[IEEE80211_MODE_HALF]	= { 3, 4,  6,  0, 0 },
+	[IEEE80211_MODE_QUARTER]= { 3, 4,  6,  0, 0 },
 	[IEEE80211_MODE_11NA]	= { 3, 4,  6,  0, 0 },
 	[IEEE80211_MODE_11NG]	= { 3, 4,  6,  0, 0 },
 };
@@ -737,6 +741,8 @@ static const struct phyParamType phyParamForAC_BK[IEEE80211_MODE_MAX] = {
 	[IEEE80211_MODE_TURBO_A]= { 7, 3, 10,  0, 0 },
 	[IEEE80211_MODE_TURBO_G]= { 7, 3, 10,  0, 0 },
 	[IEEE80211_MODE_STURBO_A]={ 7, 3, 10,  0, 0 },
+	[IEEE80211_MODE_HALF]	= { 7, 4, 10,  0, 0 },
+	[IEEE80211_MODE_QUARTER]= { 7, 4, 10,  0, 0 },
 	[IEEE80211_MODE_11NA]	= { 7, 4, 10,  0, 0 },
 	[IEEE80211_MODE_11NG]	= { 7, 4, 10,  0, 0 },
 };
@@ -749,6 +755,8 @@ static const struct phyParamType phyParamForAC_VI[IEEE80211_MODE_MAX] = {
 	[IEEE80211_MODE_TURBO_A]= { 1, 2, 3,  94, 0 },
 	[IEEE80211_MODE_TURBO_G]= { 1, 2, 3,  94, 0 },
 	[IEEE80211_MODE_STURBO_A]={ 1, 2, 3,  94, 0 },
+	[IEEE80211_MODE_HALF]	= { 1, 3, 4,  94, 0 },
+	[IEEE80211_MODE_QUARTER]= { 1, 3, 4,  94, 0 },
 	[IEEE80211_MODE_11NA]	= { 1, 3, 4,  94, 0 },
 	[IEEE80211_MODE_11NG]	= { 1, 3, 4,  94, 0 },
 };
@@ -761,6 +769,8 @@ static const struct phyParamType phyParamForAC_VO[IEEE80211_MODE_MAX] = {
 	[IEEE80211_MODE_TURBO_A]= { 1, 2, 2,  47, 0 },
 	[IEEE80211_MODE_TURBO_G]= { 1, 2, 2,  47, 0 },
 	[IEEE80211_MODE_STURBO_A]={ 1, 2, 2,  47, 0 },
+	[IEEE80211_MODE_HALF]	= { 1, 2, 3,  47, 0 },
+	[IEEE80211_MODE_QUARTER]= { 1, 2, 3,  47, 0 },
 	[IEEE80211_MODE_11NA]	= { 1, 2, 3,  47, 0 },
 	[IEEE80211_MODE_11NG]	= { 1, 2, 3,  47, 0 },
 };
@@ -774,6 +784,8 @@ static const struct phyParamType bssPhyParamForAC_BE[IEEE80211_MODE_MAX] = {
 	[IEEE80211_MODE_TURBO_A]= { 2, 3, 10,  0, 0 },
 	[IEEE80211_MODE_TURBO_G]= { 2, 3, 10,  0, 0 },
 	[IEEE80211_MODE_STURBO_A]={ 2, 3, 10,  0, 0 },
+	[IEEE80211_MODE_HALF]	= { 3, 4, 10,  0, 0 },
+	[IEEE80211_MODE_QUARTER]= { 3, 4, 10,  0, 0 },
 	[IEEE80211_MODE_11NA]	= { 3, 4, 10,  0, 0 },
 	[IEEE80211_MODE_11NG]	= { 3, 4, 10,  0, 0 },
 };
@@ -786,6 +798,8 @@ static const struct phyParamType bssPhyParamForAC_VI[IEEE80211_MODE_MAX] = {
 	[IEEE80211_MODE_TURBO_A]= { 2, 2, 3,  94, 0 },
 	[IEEE80211_MODE_TURBO_G]= { 2, 2, 3,  94, 0 },
 	[IEEE80211_MODE_STURBO_A]={ 2, 2, 3,  94, 0 },
+	[IEEE80211_MODE_HALF]	= { 2, 3, 4,  94, 0 },
+	[IEEE80211_MODE_QUARTER]= { 2, 3, 4,  94, 0 },
 	[IEEE80211_MODE_11NA]	= { 2, 3, 4,  94, 0 },
 	[IEEE80211_MODE_11NG]	= { 2, 3, 4,  94, 0 },
 };
@@ -798,6 +812,8 @@ static const struct phyParamType bssPhyParamForAC_VO[IEEE80211_MODE_MAX] = {
 	[IEEE80211_MODE_TURBO_A]= { 1, 2, 2,  47, 0 },
 	[IEEE80211_MODE_TURBO_G]= { 1, 2, 2,  47, 0 },
 	[IEEE80211_MODE_STURBO_A]={ 1, 2, 2,  47, 0 },
+	[IEEE80211_MODE_HALF]	= { 2, 2, 3,  47, 0 },
+	[IEEE80211_MODE_QUARTER]= { 2, 2, 3,  47, 0 },
 	[IEEE80211_MODE_11NA]	= { 2, 2, 3,  47, 0 },
 	[IEEE80211_MODE_11NG]	= { 2, 2, 3,  47, 0 },
 };
@@ -930,6 +946,8 @@ ieee80211_wme_updateparams_locked(struct ieee80211vap *vap)
 	    [IEEE80211_MODE_TURBO_A]	= { 1, 3, 10, 64, 0 },
 	    [IEEE80211_MODE_TURBO_G]	= { 1, 3, 10, 64, 0 },
 	    [IEEE80211_MODE_STURBO_A]	= { 1, 3, 10, 64, 0 },
+	    [IEEE80211_MODE_HALF]	= { 2, 4, 10, 64, 0 },
+	    [IEEE80211_MODE_QUARTER]	= { 2, 4, 10, 64, 0 },
 	    [IEEE80211_MODE_11NA]	= { 2, 4, 10, 64, 0 },	/* XXXcheck*/
 	    [IEEE80211_MODE_11NG]	= { 2, 4, 10, 64, 0 },	/* XXXcheck*/
 	};
@@ -1016,6 +1034,8 @@ ieee80211_wme_updateparams_locked(struct ieee80211vap *vap)
 		    [IEEE80211_MODE_TURBO_A]	= 3,
 		    [IEEE80211_MODE_TURBO_G]	= 3,
 		    [IEEE80211_MODE_STURBO_A]	= 3,
+		    [IEEE80211_MODE_HALF]	= 3,
+		    [IEEE80211_MODE_QUARTER]	= 3,
 		    [IEEE80211_MODE_11NA]	= 3,
 		    [IEEE80211_MODE_11NG]	= 3,
 		};