Attachment #1416 for bug #730

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

(-)orig/ns-3.14.1/src/wifi/model/wifi-remote-station-manager.h (-1 / +3 lines)

Lines 96-102	Link Here

  void SetMaxSlrc (uint32_t maxSlrc);

  void SetMaxSlrc (uint32_t maxSlrc);

  void SetRtsCtsThreshold (uint32_t threshold);

  void SetRtsCtsThreshold (uint32_t threshold);

  void SetFragmentationThreshold (uint32_t threshold);

  void SetFragmentationThreshold (uint32_t threshold);

  void UpdateFragmentationThreshold(void);

100

  // Invoked in a STA upon dis-association

101

  // Invoked in a STA upon dis-association

101

  // or in an AP upon reboot

102

  // or in an AP upon reboot

102

  void Reset (void);

103

  void Reset (void);

Lines 426-431	Link Here

426

  uint32_t m_maxSlrc;

427

  uint32_t m_maxSlrc;

427

  uint32_t m_rtsCtsThreshold;

428

  uint32_t m_rtsCtsThreshold;

428

  uint32_t m_fragmentationThreshold;

429

  uint32_t m_fragmentationThreshold;

430

  uint32_t m_nextFragmentationThreshold;

429

  WifiMode m_nonUnicastMode;

431

  WifiMode m_nonUnicastMode;

430

  double m_avgSlrcCoefficient;

432

  double m_avgSlrcCoefficient;

431

/**

433

/**

(-)orig/ns-3.14.1/src/wifi/model/wifi-remote-station-manager.cc (-2 / +9 lines)

Lines 165-171	Link Here

165

                   "than this value, as per IEEE Std. 802.11-2007, Section 9.4. "

165

                   "than this value, as per IEEE Std. 802.11-2007, Section 9.4. "

166

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

166

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

167

                   UintegerValue (2346),

167

                   UintegerValue (2346),

168

                   MakeUintegerAccessor (&WifiRemoteStationManager::m_fragmentationThreshold),

168

                   MakeUintegerAccessor (&WifiRemoteStationManager::SetFragmentationThreshold,

169

                                          &WifiRemoteStationManager::GetFragmentationThreshold),

169

                   MakeUintegerChecker<uint32_t> ())

170

                   MakeUintegerChecker<uint32_t> ())

170

    .AddAttribute ("NonUnicastMode", "Wifi mode used for non-unicast transmissions.",

171

    .AddAttribute ("NonUnicastMode", "Wifi mode used for non-unicast transmissions.",

171

                   WifiModeValue (),

172

                   WifiModeValue (),

Lines 259-265	Link Here

259

void

260

void

260

WifiRemoteStationManager::SetFragmentationThreshold (uint32_t threshold)

261

WifiRemoteStationManager::SetFragmentationThreshold (uint32_t threshold)

261

262

  m_fragmentationThreshold = threshold;

263

  m_nextFragmentationThreshold = threshold;

264

265

266

void

267

WifiRemoteStationManager::UpdateFragmentationThreshold (void)

268

269

  m_fragmentationThreshold = m_nextFragmentationThreshold;

263

270

264

271

265

void

272

void

(-)orig/ns-3.14.1/src/wifi/model/dca-txop.cc (+1 lines)

Lines 380-385	Link Here

380

      NS_ASSERT (m_currentPacket != 0);

380

      NS_ASSERT (m_currentPacket != 0);

381

      uint16_t sequence = m_txMiddle->GetNextSequenceNumberfor (&m_currentHdr);

381

      uint16_t sequence = m_txMiddle->GetNextSequenceNumberfor (&m_currentHdr);

382

      m_currentHdr.SetSequenceNumber (sequence);

382

      m_currentHdr.SetSequenceNumber (sequence);

383

      m_stationManager->UpdateFragmentationThreshold();

383

      m_currentHdr.SetFragmentNumber (0);

384

      m_currentHdr.SetFragmentNumber (0);

384

      m_currentHdr.SetNoMoreFragments ();

385

      m_currentHdr.SetNoMoreFragments ();

385

      m_currentHdr.SetNoRetry ();

386

      m_currentHdr.SetNoRetry ();

Return to bug 730