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

(-)a/RELEASE_NOTES (+1 lines)
 Lines 43-48    Link Here 
43 
- Bug 2838 - wifi: ht-wifi-network crashes with RTS/CTS enabled and frequency set to 2.4GHz
 43 
- Bug 2838 - wifi: ht-wifi-network crashes with RTS/CTS enabled and frequency set to 2.4GHz
44 
- Bug 2843 - spectrum, wifi: Incorrect channel width and center frequency provided for non-HT PPDUs when building SpectralDensity
 44 
- Bug 2843 - spectrum, wifi: Incorrect channel width and center frequency provided for non-HT PPDUs when building SpectralDensity
45 
- Bug 2848 - wifi: Association ID not correctly set upon association
 45 
- Bug 2848 - wifi: Association ID not correctly set upon association
46 
- Bug 2854 - wifi: he-wifi-network crashes when frequency is set at 2.4 GHz
46 

          47
          

        

        

          47
          
Known issues

          48
          
Known issues

        

        

          48
          
------------

          49
          
------------

        



(-)a/examples/wireless/examples-to-run.py
      (-6 / +5 lines)




  

    

    

       Lines 41-52
       
    
  Link Here 
    

  

        

          41
          
    ("ht-wifi-network --simulationTime=0.1 --frequency=2.4 --useRts=0 --minExpectedThroughput=5 --maxExpectedThroughput=132", "True", "True"),

          41
          
    ("ht-wifi-network --simulationTime=0.1 --frequency=2.4 --useRts=0 --minExpectedThroughput=5 --maxExpectedThroughput=132", "True", "True"),

        

        

          42
          
    ("ht-wifi-network --simulationTime=0.1 --frequency=2.4 --useRts=1 --minExpectedThroughput=4.5 --maxExpectedThroughput=128", "True", "True"),

          42
          
    ("ht-wifi-network --simulationTime=0.1 --frequency=2.4 --useRts=1 --minExpectedThroughput=4.5 --maxExpectedThroughput=128", "True", "True"),

        

        

          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.1 --useRts=1", "False", "False"), # see bug 2853


              44
              
    ("vht-wifi-network --simulationTime=0.2 --useRts=1", "True", "True"),

            

            

              45
              
    ("he-wifi-network --simulationTime=0.25 --frequency=5 --useRts=0  --minExpectedThroughput=6.35 --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=0  --minExpectedThroughput=6.35 --maxExpectedThroughput=754", "True", "True"),


              46
              
    ("he-wifi-network --simulationTime=0.25 --frequency=5 --useRts=1 --minExpectedThroughput=6 --maxExpectedThroughput=627", "True", "True"),

            

            

              47
              
    ("he-wifi-network --simulationTime=0.25 --frequency=5 --useRts=1", "False", "False"), # see bug 2853


              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=1.4 --useRts=0", "False", "False"), # see bug 2854


              48
              
    ("he-wifi-network --simulationTime=0.25 --frequency=2.4 --useRts=1 --minExpectedThroughput=6 --maxExpectedThroughput=224", "True", "True"),

            

            

              49
              
    ("he-wifi-network --simulationTime=0.25 --frequency=5 --useRts=1", "False", "False"), # see bug 2854


              
              
            

        

          50
          
    ("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"),

        

        

          51
          
    ("mixed-network --simulationTime=1", "True", "True"),

          50
          
    ("mixed-network --simulationTime=1", "True", "True"),

        

        

          52
          
    ("wifi-aggregation --simulationTime=1 --verifyResults=1", "True", "True"),

          51
          
    ("wifi-aggregation --simulationTime=1 --verifyResults=1", "True", "True"),

        



(-)a/examples/wireless/he-wifi-network.cc
      (-1 / +7 lines)




  

    

    

       Lines 89-95
       
    
  Link Here 
    

  

        

          89
          
    {

          89
          
    {

        

        

          90
          
      uint8_t index = 0;

          90
          
      uint8_t index = 0;

        

        

          91
          
      double previous = 0;

          91
          
      double previous = 0;

        

          
            

              92
              
      for (int channelWidth = 20; channelWidth <= 160; ) //MHz


              92
              
      uint8_t maxChannelWidth = frequency == 2.4 ? 40 : 160;

            

            

              
              

              93
              
      for (int channelWidth = 20; channelWidth <= maxChannelWidth; ) //MHz

            

        

          93
          
        {

          94
          
        {

        

        

          94
          
          for (int gi = 3200; gi >= 800; ) //Nanoseconds

          95
          
          for (int gi = 3200; gi >= 800; ) //Nanoseconds

        

        

          95
          
            {

          96
          
            {

        

  

    

    

       Lines 282-287
       
    
  Link Here 
    

  

        

          282
          
              gi /= 2;

          283
          
              gi /= 2;

        

        

          283
          
            }

          284
          
            }

        

        

          284
          
          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
              
            }

            

        

          285
          
        }

          291
          
        }

        

        

          286
          
    }

          292
          
    }

        

        

          287
          
  return 0;

          293
          
  return 0;

        



(-)a/src/wifi/model/wifi-remote-station-manager.cc
      (+16 lines)




  

    

    

       Lines 1781-1786
       
    
  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 ()))

            

            

              1785
              
    {

            

            

              1786
              
      state->m_channelWidth = 160;

            

            

              1787
              
    }

            

            

              1788
              
  else if (heCapabilities.GetChannelWidthSet () & 0x02 && Is5Ghz (m_wifiPhy->GetFrequency ()))

            

            

              1789
              
    {

            

            

              1790
              
      state->m_channelWidth = 80;

            

            

              1791
              
    }

            

            

              1792
              
  else if ((heCapabilities.GetChannelWidthSet () & 0x01) && Is2_4Ghz (m_wifiPhy->GetFrequency ()))

            

            

              1793
              
    {

            

            

              1794
              
      state->m_channelWidth = 40;

            

            

              1795
              
    }

            

            

              1796
              
  else

            

            

              1797
              
    {

            

            

              1798
              
      state->m_channelWidth = 20;

            

            

              1799
              
    }

            

        

          1784
          
  if (heCapabilities.GetHeLtfAndGiForHePpdus () >= 2)

          1800
          
  if (heCapabilities.GetHeLtfAndGiForHePpdus () >= 2)

        

        

          1785
          
    {

          1801
          
    {

        

        

          1786
          
      state->m_guardInterval = 800;

          1802
          
      state->m_guardInterval = 800;

        






  

  Return to bug 2854