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

(-)a/examples/wireless/examples-to-run.py (-1 / +2 lines)
 Lines 47-53    Link Here 
47 
    ("he-wifi-network --simulationTime=0.3 --frequency=5 --useRts=1 --minExpectedThroughput=6 --maxExpectedThroughput=639", "True", "True"),
 47 
    ("he-wifi-network --simulationTime=0.3 --frequency=5 --useRts=1 --minExpectedThroughput=6 --maxExpectedThroughput=639", "True", "True"),
48 
    ("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=0 --minExpectedThroughput=6 --maxExpectedThroughput=238", "True", "True"),
49 
    ("he-wifi-network --simulationTime=0.3 --frequency=2.4 --useRts=1 --minExpectedThroughput=6 --maxExpectedThroughput=224", "True", "True"),
 49 
    ("he-wifi-network --simulationTime=0.3 --frequency=2.4 --useRts=1 --minExpectedThroughput=6 --maxExpectedThroughput=224", "True", "True"),
50 
    ("simple-ht-hidden-stations --simulationTime=1 --minExpectedThroughput=22 --maxExpectedThroughput=22.5", "True", "True"),
 50 
    ("simple-ht-hidden-stations --simulationTime=1 --enableRts=0 --minExpectedThroughput=14.5 --maxExpectedThroughput=15", "True", "True"),
51 
    ("simple-ht-hidden-stations --simulationTime=1 --enableRts=1 --minExpectedThroughput=22 --maxExpectedThroughput=22.5", "True", "True"),
51 
    ("mixed-network --simulationTime=1", "True", "True"),
 52 
    ("mixed-network --simulationTime=1", "True", "True"),
52 
    ("wifi-aggregation --simulationTime=1 --verifyResults=1", "True", "True"),
 53 
    ("wifi-aggregation --simulationTime=1 --verifyResults=1", "True", "True"),
53 
    ("80211e-txop --simulationTime=1 --verifyResults=1", "True", "True"),
 54 
    ("80211e-txop --simulationTime=1 --verifyResults=1", "True", "True"),
(-)a/src/aodv/test/bug-772.cc (-1 / +1 lines)
 Lines 135-141    Link Here 
135 
  wifiPhy.Set ("TxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test
 135 
  wifiPhy.Set ("TxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test
136 
  wifiPhy.Set ("RxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test
 136 
  wifiPhy.Set ("RxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test
137 
  WifiHelper wifi;
 137 
  WifiHelper wifi;
138 
  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager", "DataMode", StringValue ("OfdmRate6Mbps"), "RtsCtsThreshold", StringValue ("2200"));
 138 
  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager", "DataMode", StringValue ("OfdmRate6Mbps"), "RtsCtsThreshold", StringValue ("2200"), "MaxSlrc", UintegerValue (7));
139 
  NetDeviceContainer devices = wifi.Install (wifiPhy, wifiMac, *m_nodes);
 139 
  NetDeviceContainer devices = wifi.Install (wifiPhy, wifiMac, *m_nodes);
140 

          140
          

        

        

          141
          
  // Assign fixed stream numbers to wifi and channel random variables

          141
          
  // Assign fixed stream numbers to wifi and channel random variables

        



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




  

    

    

       Lines 342-348
       
    
  Link Here 
    

  

        

          342
          
    .AddAttribute ("MaxSlrc",

          342
          
    .AddAttribute ("MaxSlrc",

        

        

          343
          
                   "The maximum number of retransmission attempts for a DATA packet. "

          343
          
                   "The maximum number of retransmission attempts for a DATA packet. "

        

        

          344
          
                   "This value will not have any effect on some rate control algorithms.",

          344
          
                   "This value will not have any effect on some rate control algorithms.",

        

          
            

              345
              
                   UintegerValue (7),


              345
              
                   UintegerValue (4),

            

        

          346
          
                   MakeUintegerAccessor (&WifiRemoteStationManager::SetMaxSlrc),

          346
          
                   MakeUintegerAccessor (&WifiRemoteStationManager::SetMaxSlrc),

        

        

          347
          
                   MakeUintegerChecker<uint32_t> ())

          347
          
                   MakeUintegerChecker<uint32_t> ())

        

        

          348
          
    .AddAttribute ("RtsCtsThreshold",

          348
          
    .AddAttribute ("RtsCtsThreshold",

        

  

    

    

       Lines 355-361
       
    
  Link Here 
    

  

        

          355
          
                   "If the size of the PSDU is bigger than this value, we fragment it such that the size of the fragments are equal or smaller. "

          355
          
                   "If the size of the PSDU is bigger than this value, we fragment it such that the size of the fragments are equal or smaller. "

        

        

          356
          
                   "This value does not apply when it is carried in an A-MPDU. "

          356
          
                   "This value does not apply when it is carried in an A-MPDU. "

        

        

          357
          
                   "This value will not have any effect on some rate control algorithms.",

          357
          
                   "This value will not have any effect on some rate control algorithms.",

        

          
            

              358
              
                   UintegerValue (2346),


              358
              
                   UintegerValue (65535),

            

        

          359
          
                   MakeUintegerAccessor (&WifiRemoteStationManager::DoSetFragmentationThreshold,

          359
          
                   MakeUintegerAccessor (&WifiRemoteStationManager::DoSetFragmentationThreshold,

        

        

          360
          
                                         &WifiRemoteStationManager::DoGetFragmentationThreshold),

          360
          
                                         &WifiRemoteStationManager::DoGetFragmentationThreshold),

        

        

          361
          
                   MakeUintegerChecker<uint32_t> ())

          361
          
                   MakeUintegerChecker<uint32_t> ())

        






  

  Return to bug 2920