wifi: Ideal RAA should not build SNR threshold for invalid combination

nsnam · Nov 24, 2024 · 493bad6 · 493bad6
1 parent 36e8af6
commit 493bad6
Showing 1 changed file with 26 additions and 7 deletions.
diff --git a/src/wifi/model/rate-control/ideal-wifi-manager.cc b/src/wifi/model/rate-control/ideal-wifi-manager.cc
@@ -134,11 +134,21 @@ IdealWifiManager::BuildSnrThresholds()
                     txVector.SetGuardInterval(guardInterval);
                     // derive NSS from the MCS index
                     nss = (mode.GetMcsValue() / 8) + 1;
-                    NS_LOG_DEBUG("Adding mode = " << mode.GetUniqueName() << " channel width " << j
-                                                  << " nss " << +nss << " GI " << guardInterval);
                     txVector.SetNss(nss);
                     txVector.SetMode(mode);
-                    AddSnrThreshold(txVector, GetPhy()->CalculateSnr(txVector, m_ber));
+                    if (txVector.IsValid(GetPhy()->GetPhyBand()))
+                    {
+                        NS_LOG_DEBUG("Adding mode = " << mode.GetUniqueName() << " channel width "
+                                                      << j << " nss " << +nss << " GI "
+                                                      << guardInterval);
+                        AddSnrThreshold(txVector, GetPhy()->CalculateSnr(txVector, m_ber));
+                    }
+                    else
+                    {
+                        NS_LOG_DEBUG("Skipping mode = " << mode.GetUniqueName() << " channel width "
+                                                        << j << " nss " << +nss << " GI "
+                                                        << guardInterval);
+                    }
                 }
                 else
                 {
@@ -156,12 +166,21 @@ IdealWifiManager::BuildSnrThresholds()
                     {
                         if (mode.IsAllowed(j, k))
                         {
-                            NS_LOG_DEBUG("Adding mode = " << mode.GetUniqueName()
-                                                          << " channel width " << j << " nss " << +k
-                                                          << " GI " << guardInterval);
                             txVector.SetNss(k);
                             txVector.SetMode(mode);
-                            AddSnrThreshold(txVector, GetPhy()->CalculateSnr(txVector, m_ber));
+                            if (txVector.IsValid(GetPhy()->GetPhyBand()))
+                            {
+                                NS_LOG_DEBUG("Adding mode = " << mode.GetUniqueName()
+                                                              << " channel width " << j << " nss "
+                                                              << +k << " GI " << guardInterval);
+                                AddSnrThreshold(txVector, GetPhy()->CalculateSnr(txVector, m_ber));
+                            }
+                            else
+                            {
+                                NS_LOG_DEBUG("Skipping mode = " << mode.GetUniqueName()
+                                                                << " channel width " << j << " nss "
+                                                                << +k << " GI " << guardInterval);
+                            }
                         }
                         else
                         {