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

(-)a/src/mesh/model/dot11s/hwmp-protocol-mac.cc (+1 lines)
 Lines 203-208    Link Here 
203
  meshHdr.SetMeshTtl (tag.GetTtl ());
203
  meshHdr.SetMeshTtl (tag.GetTtl ());
204
  packet->AddHeader (meshHdr);
204
  packet->AddHeader (meshHdr);
205
  header.SetAddr1 (tag.GetAddress ());
205
  header.SetAddr1 (tag.GetAddress ());
206
  header.SetQosMeshControlPresent ();
206
  return true;
207
  return true;
207
}
208
}
208
WifiActionHeader
209
WifiActionHeader
(-)a/src/wifi/model/wifi-mac-header.cc (+15 lines)
 Lines 447-452    Link Here 
447
  m_qosStuff = txop;
447
  m_qosStuff = txop;
448
}
448
}
449
449
450
void WifiMacHeader::SetQosMeshControlPresent (void)
451
{
452
  // mark bit 0 of this variable instead of bit 8, since m_qosStuff is
453
  // shifted by one byte when serialized
454
  m_qosStuff = m_qosStuff | 0x01; // bit 8 of QoS Control Field
455
}
456
457
void WifiMacHeader::SetQosNoMeshControlPresent ()
458
{
459
  // clear bit 0 of this variable instead of bit 8, since m_qosStuff is
460
  // shifted by one byte when serialized
461
  m_qosStuff = m_qosStuff & 0xfe; // bit 8 of QoS Control Field
462
}
463
464
450
Mac48Address
465
Mac48Address
451
WifiMacHeader::GetAddr1 (void) const
466
WifiMacHeader::GetAddr1 (void) const
452
{
467
{
(-)a/src/wifi/model/wifi-mac-header.h (+8 lines)
 Lines 294-299    Link Here 
294
   */
294
   */
295
  void SetQosTxopLimit (uint8_t txop);
295
  void SetQosTxopLimit (uint8_t txop);
296
  /**
296
  /**
297
   * Set the Mesh Control Present flag for the QoS header.
298
   */
299
  void SetQosMeshControlPresent ();
300
  /**
301
   * Clear the Mesh Control Present flag for the QoS header.
302
   */
303
  void SetQosNoMeshControlPresent ();
304
  /**
297
   * Set order bit in the frame control field.
305
   * Set order bit in the frame control field.
298
   */
306
   */
299
  void SetOrder (void);
307
  void SetOrder (void);

Return to bug 1901