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

(-)a/src/wave/helper/wave-helper.cc (-8 / +8 lines)
 Lines 168-174    Link Here 
168 
            mcsRate = rate - 128;
 168 
            mcsRate = rate - 128;
169 

          169
          

        

        

          170
          
            mcsKnown |= RadiotapHeader::MCS_KNOWN_BANDWIDTH;

          170
          
            mcsKnown |= RadiotapHeader::MCS_KNOWN_BANDWIDTH;

        

          
            

              171
              
            if (txVector.GetChannelWidth () == 40000000)


              171
              
            if (txVector.GetChannelWidth () == 40)

            

        

          172
          
              {

          172
          
              {

        

        

          173
          
                mcsFlags |= RadiotapHeader::MCS_FLAGS_BANDWIDTH_40;

          173
          
                mcsFlags |= RadiotapHeader::MCS_FLAGS_BANDWIDTH_40;

        

        

          174
          
              }

          174
          
              }

        

  

    

    

       Lines 249-263
       
    
  Link Here 
    

  

        

          249
          

          249
          

        

        

          250
          
            vhtKnown |= RadiotapHeader::VHT_KNOWN_BANDWIDTH;

          250
          
            vhtKnown |= RadiotapHeader::VHT_KNOWN_BANDWIDTH;

        

        

          251
          
            //not all bandwidth values are currently supported

          251
          
            //not all bandwidth values are currently supported

        

          
            

              252
              
            if (txVector.GetChannelWidth () == 40000000)


              252
              
            if (txVector.GetChannelWidth () == 40)

            

        

          253
          
              {

          253
          
              {

        

        

          254
          
                vhtBandwidth = 1;

          254
          
                vhtBandwidth = 1;

        

        

          255
          
              }

          255
          
              }

        

          
            

              256
              
            else if (txVector.GetChannelWidth () == 80000000)


              256
              
            else if (txVector.GetChannelWidth () == 80)

            

        

          257
          
              {

          257
          
              {

        

        

          258
          
                vhtBandwidth = 4;

          258
          
                vhtBandwidth = 4;

        

        

          259
          
              }

          259
          
              }

        

          
            

              260
              
            else if (txVector.GetChannelWidth () == 160000000)


              260
              
            else if (txVector.GetChannelWidth () == 160)

            

        

          261
          
              {

          261
          
              {

        

        

          262
          
                vhtBandwidth = 11;

          262
          
                vhtBandwidth = 11;

        

        

          263
          
              }

          263
          
              }

        

  

    

    

       Lines 364-370
       
    
  Link Here 
    

  

        

          364
          
            mcsRate = rate - 128;

          364
          
            mcsRate = rate - 128;

        

        

          365
          

          365
          

        

        

          366
          
            mcsKnown |= RadiotapHeader::MCS_KNOWN_BANDWIDTH;

          366
          
            mcsKnown |= RadiotapHeader::MCS_KNOWN_BANDWIDTH;

        

          
            

              367
              
            if (txVector.GetChannelWidth () == 40000000)


              367
              
            if (txVector.GetChannelWidth () == 40)

            

        

          368
          
              {

          368
          
              {

        

        

          369
          
                mcsFlags |= RadiotapHeader::MCS_FLAGS_BANDWIDTH_40;

          369
          
                mcsFlags |= RadiotapHeader::MCS_FLAGS_BANDWIDTH_40;

        

        

          370
          
              }

          370
          
              }

        

  

    

    

       Lines 446-460
       
    
  Link Here 
    

  

        

          446
          

          446
          

        

        

          447
          
            vhtKnown |= RadiotapHeader::VHT_KNOWN_BANDWIDTH;

          447
          
            vhtKnown |= RadiotapHeader::VHT_KNOWN_BANDWIDTH;

        

        

          448
          
            //not all bandwidth values are currently supported

          448
          
            //not all bandwidth values are currently supported

        

          
            

              449
              
            if (txVector.GetChannelWidth () == 40000000)


              449
              
            if (txVector.GetChannelWidth () == 40)

            

        

          450
          
              {

          450
          
              {

        

        

          451
          
                vhtBandwidth = 1;

          451
          
                vhtBandwidth = 1;

        

        

          452
          
              }

          452
          
              }

        

          
            

              453
              
            else if (txVector.GetChannelWidth () == 80000000)


              453
              
            else if (txVector.GetChannelWidth () == 80)

            

        

          454
          
              {

          454
          
              {

        

        

          455
          
                vhtBandwidth = 4;

          455
          
                vhtBandwidth = 4;

        

        

          456
          
              }

          456
          
              }

        

          
            

              457
              
            else if (txVector.GetChannelWidth () == 160000000)


              457
              
            else if (txVector.GetChannelWidth () == 160)

            

        

          458
          
              {

          458
          
              {

        

        

          459
          
                vhtBandwidth = 11;

          459
          
                vhtBandwidth = 11;

        

        

          460
          
              }

          460
          
              }

        



(-)a/src/wifi/helper/yans-wifi-helper.cc
      (-8 / +8 lines)




  

    

    

       Lines 330-336
       
    
  Link Here 
    

  

        

          330
          
            mcsRate = rate - 128;

          330
          
            mcsRate = rate - 128;

        

        

          331
          

          331
          

        

        

          332
          
            mcsKnown |= RadiotapHeader::MCS_KNOWN_BANDWIDTH;

          332
          
            mcsKnown |= RadiotapHeader::MCS_KNOWN_BANDWIDTH;

        

          
            

              333
              
            if (txVector.GetChannelWidth () == 40000000)


              333
              
            if (txVector.GetChannelWidth () == 40)

            

        

          334
          
              {

          334
          
              {

        

        

          335
          
                mcsFlags |= RadiotapHeader::MCS_FLAGS_BANDWIDTH_40;

          335
          
                mcsFlags |= RadiotapHeader::MCS_FLAGS_BANDWIDTH_40;

        

        

          336
          
              }

          336
          
              }

        

  

    

    

       Lines 411-425
       
    
  Link Here 
    

  

        

          411
          

          411
          

        

        

          412
          
            vhtKnown |= RadiotapHeader::VHT_KNOWN_BANDWIDTH;

          412
          
            vhtKnown |= RadiotapHeader::VHT_KNOWN_BANDWIDTH;

        

        

          413
          
            //not all bandwidth values are currently supported

          413
          
            //not all bandwidth values are currently supported

        

          
            

              414
              
            if (txVector.GetChannelWidth () == 40000000)


              414
              
            if (txVector.GetChannelWidth () == 40)

            

        

          415
          
              {

          415
          
              {

        

        

          416
          
                vhtBandwidth = 1;

          416
          
                vhtBandwidth = 1;

        

        

          417
          
              }

          417
          
              }

        

          
            

              418
              
            else if (txVector.GetChannelWidth () == 80000000)


              418
              
            else if (txVector.GetChannelWidth () == 80)

            

        

          419
          
              {

          419
          
              {

        

        

          420
          
                vhtBandwidth = 4;

          420
          
                vhtBandwidth = 4;

        

        

          421
          
              }

          421
          
              }

        

          
            

              422
              
            else if (txVector.GetChannelWidth () == 160000000)


              422
              
            else if (txVector.GetChannelWidth () == 160)

            

        

          423
          
              {

          423
          
              {

        

        

          424
          
                vhtBandwidth = 11;

          424
          
                vhtBandwidth = 11;

        

        

          425
          
              }

          425
          
              }

        

  

    

    

       Lines 526-532
       
    
  Link Here 
    

  

        

          526
          
            mcsRate = rate - 128;

          526
          
            mcsRate = rate - 128;

        

        

          527
          

          527
          

        

        

          528
          
            mcsKnown |= RadiotapHeader::MCS_KNOWN_BANDWIDTH;

          528
          
            mcsKnown |= RadiotapHeader::MCS_KNOWN_BANDWIDTH;

        

          
            

              529
              
            if (txVector.GetChannelWidth () == 40000000)


              529
              
            if (txVector.GetChannelWidth () == 40)

            

        

          530
          
              {

          530
          
              {

        

        

          531
          
                mcsFlags |= RadiotapHeader::MCS_FLAGS_BANDWIDTH_40;

          531
          
                mcsFlags |= RadiotapHeader::MCS_FLAGS_BANDWIDTH_40;

        

        

          532
          
              }

          532
          
              }

        

  

    

    

       Lines 608-622
       
    
  Link Here 
    

  

        

          608
          

          608
          

        

        

          609
          
            vhtKnown |= RadiotapHeader::VHT_KNOWN_BANDWIDTH;

          609
          
            vhtKnown |= RadiotapHeader::VHT_KNOWN_BANDWIDTH;

        

        

          610
          
            //not all bandwidth values are currently supported

          610
          
            //not all bandwidth values are currently supported

        

          
            

              611
              
            if (txVector.GetChannelWidth () == 40000000)


              611
              
            if (txVector.GetChannelWidth () == 40)

            

        

          612
          
              {

          612
          
              {

        

        

          613
          
                vhtBandwidth = 1;

          613
          
                vhtBandwidth = 1;

        

        

          614
          
              }

          614
          
              }

        

          
            

              615
              
            else if (txVector.GetChannelWidth () == 80000000)


              615
              
            else if (txVector.GetChannelWidth () == 80)

            

        

          616
          
              {

          616
          
              {

        

        

          617
          
                vhtBandwidth = 4;

          617
          
                vhtBandwidth = 4;

        

        

          618
          
              }

          618
          
              }

        

          
            

              619
              
            else if (txVector.GetChannelWidth () == 160000000)


              619
              
            else if (txVector.GetChannelWidth () == 160)

            

        

          620
          
              {

          620
          
              {

        

        

          621
          
                vhtBandwidth = 11;

          621
          
                vhtBandwidth = 11;

        

        

          622
          
              }

          622
          
              }

        






  

  Return to bug 2267