View | Details | Raw Unified | Return to bug 2854
Collapse All | Expand All

(-)a/examples/wireless/examples-to-run.py (-1 / +1 lines)
 Lines 43-49    Link Here 
43 
    ("vht-wifi-network --simulationTime=0.1 --useRts=0  --minExpectedThroughput=5 --maxExpectedThroughput=555", "True", "True"),
 43 
    ("vht-wifi-network --simulationTime=0.1 --useRts=0  --minExpectedThroughput=5 --maxExpectedThroughput=555", "True", "True"),
44 
    ("vht-wifi-network --simulationTime=0.2 --useRts=1", "True", "True"),
 44 
    ("vht-wifi-network --simulationTime=0.2 --useRts=1", "True", "True"),
45 
    ("he-wifi-network --simulationTime=0.25 --frequency=5 --useRts=0  --minExpectedThroughput=6 --maxExpectedThroughput=754", "True", "True"),
 45 
    ("he-wifi-network --simulationTime=0.25 --frequency=5 --useRts=0  --minExpectedThroughput=6 --maxExpectedThroughput=754", "True", "True"),
46 
    ("he-wifi-network --simulationTime=0.25 --frequency=5 --useRts=1 --minExpectedThroughput=6 --maxExpectedThroughput=627", "True", "True"),
 46 
    ("he-wifi-network --simulationTime=0.3 --frequency=5 --useRts=1 --minExpectedThroughput=6 --maxExpectedThroughput=639", "True", "True"),
47 
    ("he-wifi-network --simulationTime=0.25 --frequency=2.4 --useRts=0 --minExpectedThroughput=6 --maxExpectedThroughput=238", "True", "True"),
 47 
    ("he-wifi-network --simulationTime=0.25 --frequency=2.4 --useRts=0 --minExpectedThroughput=6 --maxExpectedThroughput=238", "True", "True"),
48 
    ("he-wifi-network --simulationTime=0.25 --frequency=2.4 --useRts=1 --minExpectedThroughput=6 --maxExpectedThroughput=224", "True", "True"),
 48 
    ("he-wifi-network --simulationTime=0.25 --frequency=2.4 --useRts=1 --minExpectedThroughput=6 --maxExpectedThroughput=224", "True", "True"),
49 
    ("simple-ht-hidden-stations --simulationTime=1 --minExpectedThroughput=16.5 --maxExpectedThroughput=17", "True", "True"),
 49 
    ("simple-ht-hidden-stations --simulationTime=1 --minExpectedThroughput=16.5 --maxExpectedThroughput=17", "True", "True"),
(-)a/examples/wireless/he-wifi-network.cc (-5 lines)
 Lines 283-293    Link Here 
283 
              gi /= 2;
 283 
              gi /= 2;
284 
            }
 284 
            }
285 
          channelWidth *= 2;
 285 
          channelWidth *= 2;
286 
          //At 5 GHz, possible maximum supported channel widths are 20, 80 and 160 MHz
287 
          if (channelWidth == 40 && frequency == 5)
288 
            {
289 
              channelWidth = 80;
290 
            }
291 
        }
 286 
        }
292 
    }
 287 
    }
293 
  return 0;
 288 
  return 0;
(-)a/src/wifi/model/wifi-remote-station-manager.cc (-12 / +19 lines)
 Lines 1781-1801    Link Here 
1781 
  NS_LOG_FUNCTION (this << from << heCapabilities);
 1781 
  NS_LOG_FUNCTION (this << from << heCapabilities);
1782 
  WifiRemoteStationState *state;
 1782 
  WifiRemoteStationState *state;
1783 
  state = LookupState (from);
 1783 
  state = LookupState (from);
1784 
  if (heCapabilities.GetChannelWidthSet () & 0x04 && Is5Ghz (m_wifiPhy->GetFrequency ()))
 1784 
  if (Is5Ghz (m_wifiPhy->GetFrequency ()))
1785 
    {
1786 
      state->m_channelWidth = 160;
1787 
    }
1788 
  else if (heCapabilities.GetChannelWidthSet () & 0x02 && Is5Ghz (m_wifiPhy->GetFrequency ()))
1789 
    {
 1785 
    {
1790 
      state->m_channelWidth = 80;
 1786 
      if (heCapabilities.GetChannelWidthSet () & 0x04)
1787 
        {
1788 
          state->m_channelWidth = 160;
1789 
        }
1790 
      else if (heCapabilities.GetChannelWidthSet () & 0x02)
1791 
        {
1792 
          state->m_channelWidth = 80;
1793 
        }
1794 
      //For other cases at 5 GHz, the supported channel width is set by the VHT capabilities
1791 
    }
 1795 
    }
1792 
  else if ((heCapabilities.GetChannelWidthSet () & 0x01) && Is2_4Ghz (m_wifiPhy->GetFrequency ()))
 1796 
  else if (Is2_4Ghz (m_wifiPhy->GetFrequency ()))
1793 
    {
 1797 
    {
1794 
      state->m_channelWidth = 40;
 1798 
      if (heCapabilities.GetChannelWidthSet () & 0x01)
1795 
    }
 1799 
        {
1796 
  else
 1800 
          state->m_channelWidth = 40;
1797 
    {
 1801 
        }
1798 
      state->m_channelWidth = 20;
 1802 
      else
1803 
        {
1804 
          state->m_channelWidth = 20;
1805 
        }
1799 
    }
 1806 
    }
1800 
  if (heCapabilities.GetHeLtfAndGiForHePpdus () >= 2)
 1807 
  if (heCapabilities.GetHeLtfAndGiForHePpdus () >= 2)
1801 
    {
 1808 
    {

Return to bug 2854