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

(-)a/examples/wireless/examples-to-run.py (-1 / +1 lines)
 Lines 33-39    Link Here 
33 
    ("ofdm-he-validation", "True", "True"),
 33 
    ("ofdm-he-validation", "True", "True"),
34 
    ("ht-wifi-network --simulationTime=0.1 --minExpectedThroughput=5 --maxExpectedThroughput=134", "True", "True"),
 34 
    ("ht-wifi-network --simulationTime=0.1 --minExpectedThroughput=5 --maxExpectedThroughput=134", "True", "True"),
35 
    ("vht-wifi-network --simulationTime=0.1 --minExpectedThroughput=5 --maxExpectedThroughput=555", "True", "True"),
 35 
    ("vht-wifi-network --simulationTime=0.1 --minExpectedThroughput=5 --maxExpectedThroughput=555", "True", "True"),
36 
    ("he-wifi-network --simulationTime=0.25 --minExpectedThroughput=6.5 --maxExpectedThroughput=754", "True", "True"),
 36 
    ("he-wifi-network --simulationTime=0.25 --minExpectedThroughput=6.35 --maxExpectedThroughput=754", "True", "True"),
37 
    ("simple-ht-hidden-stations --simulationTime=1 --minExpectedThroughput=16.7 --maxExpectedThroughput=16.8", "True", "True"),
 37 
    ("simple-ht-hidden-stations --simulationTime=1 --minExpectedThroughput=16.7 --maxExpectedThroughput=16.8", "True", "True"),
38 
    ("mixed-network --simulationTime=1", "True", "True"),
 38 
    ("mixed-network --simulationTime=1", "True", "True"),
39 
    ("wifi-aggregation --simulationTime=1 --verifyResults=1", "True", "True"),
 39 
    ("wifi-aggregation --simulationTime=1 --verifyResults=1", "True", "True"),
(-)a/examples/wireless/wifi-aggregation.cc (-1 / +1 lines)
 Lines 284-290    Link Here 
284 
  uint64_t totalPacketsThrough = DynamicCast<UdpServer> (serverAppA.Get (0))->GetReceived ();
 284 
  uint64_t totalPacketsThrough = DynamicCast<UdpServer> (serverAppA.Get (0))->GetReceived ();
285 
  double throughput = totalPacketsThrough * payloadSize * 8 / (simulationTime * 1000000.0);
 285 
  double throughput = totalPacketsThrough * payloadSize * 8 / (simulationTime * 1000000.0);
286 
  std::cout << "Throughput with default configuration (A-MPDU aggregation enabled, 65kB): " << throughput << " Mbit/s" << '\n';
 286 
  std::cout << "Throughput with default configuration (A-MPDU aggregation enabled, 65kB): " << throughput << " Mbit/s" << '\n';
287 
  if (verifyResults && (throughput < 59.5 || throughput > 60.5))
 287 
  if (verifyResults && (throughput < 59 || throughput > 60))
288 
    {
 288 
    {
289 
      NS_LOG_ERROR ("Obtained throughput " << throughput << " is not in the expected boundaries!");
 289 
      NS_LOG_ERROR ("Obtained throughput " << throughput << " is not in the expected boundaries!");
290 
      exit (1);
 290 
      exit (1);
(-)a/src/wifi/model/mac-low.cc (-3 / +3 lines)
 Lines 2669-2682    Link Here 
2669 
      return true;
 2669 
      return true;
2670 
    }
 2670 
    }
2671 

          2671
          

        

          
            

              2672
              
  Time aPPDUMaxTime = MilliSeconds (10);


              2672
              
  Time aPPDUMaxTime = MicroSeconds (5484);

            

        

          2673
          
  uint8_t tid = GetTid (peekedPacket, peekedHdr);

          2673
          
  uint8_t tid = GetTid (peekedPacket, peekedHdr);

        

        

          2674
          
  AcIndex ac = QosUtilsMapTidToAc (tid);

          2674
          
  AcIndex ac = QosUtilsMapTidToAc (tid);

        

        

          2675
          
  std::map<AcIndex, Ptr<EdcaTxopN> >::const_iterator edcaIt = m_edca.find (ac);

          2675
          
  std::map<AcIndex, Ptr<EdcaTxopN> >::const_iterator edcaIt = m_edca.find (ac);

        

        

          2676
          

          2676
          

        

          
            

              2677
              
  if (m_currentTxVector.GetMode ().GetModulationClass () == WIFI_MOD_CLASS_VHT)


              2677
              
  if (m_phy->GetGreenfield ())

            

        

          2678
          
    {

          2678
          
    {

        

          
            

              2679
              
      aPPDUMaxTime = MicroSeconds (5484);


              2679
              
      aPPDUMaxTime = MicroSeconds (10000);

            

        

          2680
          
    }

          2680
          
    }

        

        

          2681
          

          2681
          

        

        

          2682
          
  //A STA shall not transmit a PPDU that has a duration that is greater than aPPDUMaxTime

          2682
          
  //A STA shall not transmit a PPDU that has a duration that is greater than aPPDUMaxTime

        






  

  Return to bug 2757