Attachment #1840 for bug #1912

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

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

Lines 81-86	Link Here

  m_beaconDca->SetMaxCw (0);

  m_beaconDca->SetMaxCw (0);

  m_beaconDca->SetLow (m_low);

  m_beaconDca->SetLow (m_low);

  m_beaconDca->SetManager (m_dcfManager);

  m_beaconDca->SetManager (m_dcfManager);

  m_beaconDca->SetTxMiddle (m_txMiddle);

  // Let the lower layers know that we are acting as an AP.

  // Let the lower layers know that we are acting as an AP.

  SetTypeOfStation (AP);

  SetTypeOfStation (AP);

(-)a/src/wifi/model/dca-txop.cc (-2 / +5 lines)

Lines 145-151	Link Here

145

  m_dcf = new DcaTxop::Dcf (this);

145

  m_dcf = new DcaTxop::Dcf (this);

146

  m_queue = CreateObject<WifiMacQueue> ();

146

  m_queue = CreateObject<WifiMacQueue> ();

147

  m_rng = new RealRandomStream ();

147

  m_rng = new RealRandomStream ();

148

  m_txMiddle = new MacTxMiddle ();

149

148

150

149

151

DcaTxop::~DcaTxop ()

150

DcaTxop::~DcaTxop ()

Lines 163-169	Link Here

163

  delete m_transmissionListener;

162

  delete m_transmissionListener;

164

  delete m_dcf;

163

  delete m_dcf;

165

  delete m_rng;

164

  delete m_rng;

166

  delete m_txMiddle;

167

  m_transmissionListener = 0;

165

  m_transmissionListener = 0;

168

  m_dcf = 0;

166

  m_dcf = 0;

169

  m_rng = 0;

167

  m_rng = 0;

Lines 178-183	Link Here

178

  m_manager->Add (m_dcf);

176

  m_manager->Add (m_dcf);

179

177

180

178

179

void DcaTxop::SetTxMiddle (MacTxMiddle *txMiddle)

180

181

  m_txMiddle = txMiddle;

182

183

181

void

184

void

182

DcaTxop::SetLow (Ptr<MacLow> low)

185

DcaTxop::SetLow (Ptr<MacLow> low)

183

186

(-)a/src/wifi/model/dca-txop.h (+6 lines)

Lines 101-106	Link Here

101

   * \param remoteManager WifiRemoteStationManager

101

   * \param remoteManager WifiRemoteStationManager

102

*/

102

*/

103

  void SetWifiRemoteStationManager (Ptr<WifiRemoteStationManager> remoteManager);

103

  void SetWifiRemoteStationManager (Ptr<WifiRemoteStationManager> remoteManager);

104

/**

105

   * Set MacTxMiddle this DcaTxop is associated to.

106

107

   * \param txMiddle MacTxMiddle

108

*/

109

  void SetTxMiddle (MacTxMiddle *txMiddle);

104

110

105

/**

111

/**

106

   * \param callback the callback to invoke when a

112

   * \param callback the callback to invoke when a

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

Lines 57-62	Link Here

  m_dca = CreateObject<DcaTxop> ();

  m_dca = CreateObject<DcaTxop> ();

  m_dca->SetLow (m_low);

  m_dca->SetLow (m_low);

  m_dca->SetManager (m_dcfManager);

  m_dca->SetManager (m_dcfManager);

  m_dca->SetTxMiddle(m_txMiddle);

  m_dca->SetTxOkCallback (MakeCallback (&RegularWifiMac::TxOk, this));

  m_dca->SetTxOkCallback (MakeCallback (&RegularWifiMac::TxOk, this));

  m_dca->SetTxFailedCallback (MakeCallback (&RegularWifiMac::TxFailed, this));

  m_dca->SetTxFailedCallback (MakeCallback (&RegularWifiMac::TxFailed, this));

Return to bug 1912