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

(-)a/src/wave/model/ocb-wifi-mac.cc (-1 / +1 lines)
 Lines 213-219   OcbWifiMac::Enqueue (Ptr<const Packet> packet, Mac48Address to) Link Here 
213 

          213
          

        

        

          214
          
  if (GetHtSupported () || GetVhtSupported ())

          214
          
  if (GetHtSupported () || GetVhtSupported ())

        

        

          215
          
    {

          215
          
    {

        

          
            

              216
              
      hdr.SetNoOrder ();


              216
              
      hdr.SetNoOrder (); // explicitly set to 0 for the time being since HT/VHT/HE control field is not yet implemented (set it to 1 when implemented)

            

        

          217
          
    }

          217
          
    }

        

        

          218
          
  hdr.SetAddr1 (to);

          218
          
  hdr.SetAddr1 (to);

        

        

          219
          
  hdr.SetAddr2 (GetAddress ());

          219
          
  hdr.SetAddr2 (GetAddress ());

        



(-)a/src/wifi/model/adhoc-wifi-mac.cc
      (-1 / +1 lines)




  

    

    

       Lines 139-145
      AdhocWifiMac::Enqueue (Ptr<const Packet> packet, Mac48Address to) 
    
  Link Here 
    

  

        

          139
          

          139
          

        

        

          140
          
  if (GetHtSupported () || GetVhtSupported () || GetHeSupported ())

          140
          
  if (GetHtSupported () || GetVhtSupported () || GetHeSupported ())

        

        

          141
          
    {

          141
          
    {

        

          
            

              142
              
      hdr.SetNoOrder ();


              142
              
      hdr.SetNoOrder (); // explicitly set to 0 for the time being since HT/VHT/HE control field is not yet implemented (set it to 1 when implemented)

            

        

          143
          
    }

          143
          
    }

        

        

          144
          
  hdr.SetAddr1 (to);

          144
          
  hdr.SetAddr1 (to);

        

        

          145
          
  hdr.SetAddr2 (m_low->GetAddress ());

          145
          
  hdr.SetAddr2 (m_low->GetAddress ());

        



(-)a/src/wifi/model/ap-wifi-mac.cc
      (-4 / +1 lines)




  

    

    

       Lines 347-353
      ApWifiMac::ForwardDown (Ptr<const Packet> packet, Mac48Address from, 
    
  Link Here 
    

  

        

          347
          

          347
          

        

        

          348
          
  if (GetQosSupported () || GetHtSupported () || GetVhtSupported () || GetHeSupported ())

          348
          
  if (GetQosSupported () || GetHtSupported () || GetVhtSupported () || GetHeSupported ())

        

        

          349
          
    {

          349
          
    {

        

          
            

              350
              
      hdr.SetNoOrder ();


              350
              
      hdr.SetNoOrder (); // explicitly set to 0 for the time being since HT/VHT/HE control field is not yet implemented (set it to 1 when implemented)

            

        

          351
          
    }

          351
          
    }

        

        

          352
          
  hdr.SetAddr1 (to);

          352
          
  hdr.SetAddr1 (to);

        

        

          353
          
  hdr.SetAddr2 (GetAddress ());

          353
          
  hdr.SetAddr2 (GetAddress ());

        

  

    

    

       Lines 716-722
      ApWifiMac::SendProbeResp (Mac48Address to) 
    
  Link Here 
    

  

        

          716
          
  hdr.SetAddr3 (GetAddress ());

          716
          
  hdr.SetAddr3 (GetAddress ());

        

        

          717
          
  hdr.SetDsNotFrom ();

          717
          
  hdr.SetDsNotFrom ();

        

        

          718
          
  hdr.SetDsNotTo ();

          718
          
  hdr.SetDsNotTo ();

        

            

              719
              
  hdr.SetNoOrder ();

              
              
            

        

          720
          
  Ptr<Packet> packet = Create<Packet> ();

          719
          
  Ptr<Packet> packet = Create<Packet> ();

        

        

          721
          
  MgtProbeResponseHeader probe;

          720
          
  MgtProbeResponseHeader probe;

        

        

          722
          
  probe.SetSsid (GetSsid ());

          721
          
  probe.SetSsid (GetSsid ());

        

  

    

    

       Lines 773-779
      ApWifiMac::SendAssocResp (Mac48Address to, bool success, bool isReassoc) 
    
  Link Here 
    

  

        

          773
          
  hdr.SetAddr3 (GetAddress ());

          772
          
  hdr.SetAddr3 (GetAddress ());

        

        

          774
          
  hdr.SetDsNotFrom ();

          773
          
  hdr.SetDsNotFrom ();

        

        

          775
          
  hdr.SetDsNotTo ();

          774
          
  hdr.SetDsNotTo ();

        

            

              776
              
  hdr.SetNoOrder ();

              
              
            

        

          777
          
  Ptr<Packet> packet = Create<Packet> ();

          775
          
  Ptr<Packet> packet = Create<Packet> ();

        

        

          778
          
  MgtAssocResponseHeader assoc;

          776
          
  MgtAssocResponseHeader assoc;

        

        

          779
          
  StatusCode code;

          777
          
  StatusCode code;

        

  

    

    

       Lines 852-858
      ApWifiMac::SendOneBeacon (void) 
    
  Link Here 
    

  

        

          852
          
  hdr.SetAddr3 (GetAddress ());

          850
          
  hdr.SetAddr3 (GetAddress ());

        

        

          853
          
  hdr.SetDsNotFrom ();

          851
          
  hdr.SetDsNotFrom ();

        

        

          854
          
  hdr.SetDsNotTo ();

          852
          
  hdr.SetDsNotTo ();

        

            

              855
              
  hdr.SetNoOrder ();

              
              
            

        

          856
          
  Ptr<Packet> packet = Create<Packet> ();

          853
          
  Ptr<Packet> packet = Create<Packet> ();

        

        

          857
          
  MgtBeaconHeader beacon;

          854
          
  MgtBeaconHeader beacon;

        

        

          858
          
  beacon.SetSsid (GetSsid ());

          855
          
  beacon.SetSsid (GetSsid ());

        



(-)a/src/wifi/model/sta-wifi-mac.cc
      (-3 / +1 lines)




  

    

    

       Lines 150-156
      StaWifiMac::SendProbeRequest (void) 
    
  Link Here 
    

  

        

          150
          
  hdr.SetAddr3 (Mac48Address::GetBroadcast ());

          150
          
  hdr.SetAddr3 (Mac48Address::GetBroadcast ());

        

        

          151
          
  hdr.SetDsNotFrom ();

          151
          
  hdr.SetDsNotFrom ();

        

        

          152
          
  hdr.SetDsNotTo ();

          152
          
  hdr.SetDsNotTo ();

        

            

              153
              
  hdr.SetNoOrder ();

              
              
            

        

          154
          
  Ptr<Packet> packet = Create<Packet> ();

          153
          
  Ptr<Packet> packet = Create<Packet> ();

        

        

          155
          
  MgtProbeRequestHeader probe;

          154
          
  MgtProbeRequestHeader probe;

        

        

          156
          
  probe.SetSsid (GetSsid ());

          155
          
  probe.SetSsid (GetSsid ());

        

  

    

    

       Lines 188-194
      StaWifiMac::SendAssociationRequest (bool isReassoc) 
    
  Link Here 
    

  

        

          188
          
  hdr.SetAddr3 (GetBssid ());

          187
          
  hdr.SetAddr3 (GetBssid ());

        

        

          189
          
  hdr.SetDsNotFrom ();

          188
          
  hdr.SetDsNotFrom ();

        

        

          190
          
  hdr.SetDsNotTo ();

          189
          
  hdr.SetDsNotTo ();

        

            

              191
              
  hdr.SetNoOrder ();

              
              
            

        

          192
          
  Ptr<Packet> packet = Create<Packet> ();

          190
          
  Ptr<Packet> packet = Create<Packet> ();

        

        

          193
          
  if (!isReassoc)

          191
          
  if (!isReassoc)

        

        

          194
          
    {

          192
          
    {

        

  

    

    

       Lines 467-473
      StaWifiMac::Enqueue (Ptr<const Packet> packet, Mac48Address to) 
    
  Link Here 
    

  

        

          467
          
    }

          465
          
    }

        

        

          468
          
  if (GetQosSupported () || GetHtSupported () || GetVhtSupported () || GetHeSupported ())

          466
          
  if (GetQosSupported () || GetHtSupported () || GetVhtSupported () || GetHeSupported ())

        

        

          469
          
    {

          467
          
    {

        

          
            

              470
              
      hdr.SetNoOrder ();


              468
              
      hdr.SetNoOrder (); // explicitly set to 0 for the time being since HT/VHT/HE control field is not yet implemented (set it to 1 when implemented)

            

        

          471
          
    }

          469
          
    }

        

        

          472
          

          470
          

        

        

          473
          
  hdr.SetAddr1 (GetBssid ());

          471
          
  hdr.SetAddr1 (GetBssid ());

        



(-)a/src/wifi/model/wifi-mac-header.cc
      (-1 / +1 lines)




  

    

    

       Lines 53-59
      enum 
    
  Link Here 
    

  

        

          53
          
WifiMacHeader::WifiMacHeader ()

          53
          
WifiMacHeader::WifiMacHeader ()

        

        

          54
          
  : m_ctrlMoreData (0),

          54
          
  : m_ctrlMoreData (0),

        

        

          55
          
    m_ctrlWep (0),

          55
          
    m_ctrlWep (0),

        

          
            

              56
              
    m_ctrlOrder (1),


              56
              
    m_ctrlOrder (0),

            

        

          57
          
    m_amsduPresent (0)

          57
          
    m_amsduPresent (0)

        

        

          58
          
{

          58
          
{

        

        

          59
          
}

          59
          
}

        



(-)a/src/wifi/model/wifi-mac-header.h
      (-1 / +1 lines)




  

    

    

       Lines 606-612
      private: 
    
  Link Here 
    

  

        

          606
          
  uint8_t m_ctrlRetry; ///< control retry

          606
          
  uint8_t m_ctrlRetry; ///< control retry

        

        

          607
          
  uint8_t m_ctrlMoreData; ///< control more data

          607
          
  uint8_t m_ctrlMoreData; ///< control more data

        

        

          608
          
  uint8_t m_ctrlWep; ///< control WEP

          608
          
  uint8_t m_ctrlWep; ///< control WEP

        

          
            

              609
              
  uint8_t m_ctrlOrder; ///< control order


              609
              
  uint8_t m_ctrlOrder; ///< control order (set to 1 for QoS Data and Management frames to signify that HT/VHT/HE control field is present, knowing that the latter are not implemented yet)

            

        

          610
          
  uint16_t m_duration; ///< duration

          610
          
  uint16_t m_duration; ///< duration

        

        

          611
          
  Mac48Address m_addr1; ///< address 1

          611
          
  Mac48Address m_addr1; ///< address 1

        

        

          612
          
  Mac48Address m_addr2; ///< address 2

          612
          
  Mac48Address m_addr2; ///< address 2

        






  

  Return to bug 2941