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

(-)a/src/wifi/model/aarf-wifi-manager.cc (+20 lines)
 Lines 273-276   AarfWifiManager::IsLowLatency (void) const Link Here 
273
  return true;
273
  return true;
274
}
274
}
275
275
276
void
277
AarfWifiManager::SetHtSupported (bool enable)
278
{
279
  //HT is not supported by this algorithm.
280
  if (enable)
281
    {
282
      NS_FATAL_ERROR ("WifiRemoteStationManager selected does not support HT rates");
283
    }
284
}
285
286
void
287
AarfWifiManager::SetVhtSupported (bool enable)
288
{
289
  //VHT is not supported by this algorithm.
290
  if (enable)
291
    {
292
      NS_FATAL_ERROR ("WifiRemoteStationManager selected does not support VHT rates");
293
    }
294
}
295
276
} //namespace ns3
296
} //namespace ns3
(-)a/src/wifi/model/aarf-wifi-manager.h (+8 lines)
 Lines 33-38   namespace ns3 { Link Here 
33
 * was initially described in <i>IEEE 802.11 Rate Adaptation:
33
 * was initially described in <i>IEEE 802.11 Rate Adaptation:
34
 * A Practical Approach</i>, by M. Lacage, M.H. Manshaei, and
34
 * A Practical Approach</i>, by M. Lacage, M.H. Manshaei, and
35
 * T. Turletti.
35
 * T. Turletti.
36
 *
37
 * This RAA does not support HT or VHT modes and will error exit
38
 * if the user tries to configure this RAA with a Wi-Fi MAC that
39
 * has VhtSupported or HtSupported set.
36
 */
40
 */
37
class AarfWifiManager : public WifiRemoteStationManager
41
class AarfWifiManager : public WifiRemoteStationManager
38
{
42
{
 Lines 40-45   public: Link Here 
40
  static TypeId GetTypeId (void);
44
  static TypeId GetTypeId (void);
41
  AarfWifiManager ();
45
  AarfWifiManager ();
42
  virtual ~AarfWifiManager ();
46
  virtual ~AarfWifiManager ();
47
48
  // Inherited from WifiRemoteStationManager
49
  virtual void SetHtSupported (bool enable);
50
  virtual void SetVhtSupported (bool enable);
43
private:
51
private:
44
  //overriden from base class
52
  //overriden from base class
45
  virtual WifiRemoteStation * DoCreateStation (void) const;
53
  virtual WifiRemoteStation * DoCreateStation (void) const;
(-)a/src/wifi/model/aarfcd-wifi-manager.cc (+21 lines)
 Lines 404-408   AarfcdWifiManager::ResetRtsWnd (AarfcdWifiRemoteStation *station) Link Here 
404
  station->m_rtsWnd = m_minRtsWnd;
404
  station->m_rtsWnd = m_minRtsWnd;
405
}
405
}
406
406
407
void
408
AarfcdWifiManager::SetHtSupported (bool enable)
409
{
410
  //HT is not supported by this algorithm.
411
  if (enable)
412
    {
413
      NS_FATAL_ERROR ("WifiRemoteStationManager selected does not support HT rates");
414
    }
415
}
416
417
void
418
AarfcdWifiManager::SetVhtSupported (bool enable)
419
{
420
  //VHT is not supported by this algorithm.
421
  if (enable)
422
    {
423
      NS_FATAL_ERROR ("WifiRemoteStationManager selected does not support VHT rates");
424
    }
425
}
426
427
407
428
408
} //namespace ns3
429
} //namespace ns3
(-)a/src/wifi/model/aarfcd-wifi-manager.h (+8 lines)
 Lines 35-40   struct AarfcdWifiRemoteStation; Link Here 
35
 * The implementation available here was done by Federico Maguolo for a very early development
35
 * The implementation available here was done by Federico Maguolo for a very early development
36
 * version of ns-3. Federico died before merging this work in ns-3 itself so his code was ported
36
 * version of ns-3. Federico died before merging this work in ns-3 itself so his code was ported
37
 * to ns-3 later without his supervision.
37
 * to ns-3 later without his supervision.
38
 *
39
 * This RAA does not support HT or VHT modes and will error exit
40
 * if the user tries to configure this RAA with a Wi-Fi MAC that
41
 * has VhtSupported or HtSupported set.
38
 */
42
 */
39
class AarfcdWifiManager : public WifiRemoteStationManager
43
class AarfcdWifiManager : public WifiRemoteStationManager
40
{
44
{
 Lines 43-48   public: Link Here 
43
  AarfcdWifiManager ();
47
  AarfcdWifiManager ();
44
  virtual ~AarfcdWifiManager ();
48
  virtual ~AarfcdWifiManager ();
45
49
50
  // Inherited from WifiRemoteStationManager
51
  virtual void SetHtSupported (bool enable);
52
  virtual void SetVhtSupported (bool enable);
53
46
private:
54
private:
47
  // overriden from base class
55
  // overriden from base class
48
  virtual WifiRemoteStation * DoCreateStation (void) const;
56
  virtual WifiRemoteStation * DoCreateStation (void) const;
(-)a/src/wifi/model/amrr-wifi-manager.cc (+21 lines)
 Lines 375-378   AmrrWifiManager::IsLowLatency (void) const Link Here 
375
  return true;
375
  return true;
376
}
376
}
377
377
378
void
379
AmrrWifiManager::SetHtSupported (bool enable)
380
{
381
  //HT is not supported by this algorithm.
382
  if (enable)
383
    {
384
      NS_FATAL_ERROR ("WifiRemoteStationManager selected does not support HT rates");
385
    }
386
}
387
388
void
389
AmrrWifiManager::SetVhtSupported (bool enable)
390
{
391
  //VHT is not supported by this algorithm.
392
  if (enable)
393
    {
394
      NS_FATAL_ERROR ("WifiRemoteStationManager selected does not support VHT rates");
395
    }
396
}
397
398
378
} //namespace ns3
399
} //namespace ns3
(-)a/src/wifi/model/amrr-wifi-manager.h (+7 lines)
 Lines 36-41   struct AmrrWifiRemoteStation; Link Here 
36
 * was initially described in <i>IEEE 802.11 Rate Adaptation:
36
 * was initially described in <i>IEEE 802.11 Rate Adaptation:
37
 * A Practical Approach</i>, by M. Lacage, M.H. Manshaei, and
37
 * A Practical Approach</i>, by M. Lacage, M.H. Manshaei, and
38
 * T. Turletti.
38
 * T. Turletti.
39
 *
40
 * This RAA does not support HT or VHT modes and will error exit
41
 * if the user tries to configure this RAA with a Wi-Fi MAC that
42
 * has VhtSupported or HtSupported set.
39
 */
43
 */
40
class AmrrWifiManager : public WifiRemoteStationManager
44
class AmrrWifiManager : public WifiRemoteStationManager
41
{
45
{
 Lines 44-49   public: Link Here 
44
48
45
  AmrrWifiManager ();
49
  AmrrWifiManager ();
46
50
51
  // Inherited from WifiRemoteStationManager
52
  virtual void SetHtSupported (bool enable);
53
  virtual void SetVhtSupported (bool enable);
47
54
48
private:
55
private:
49
  //overriden from base class
56
  //overriden from base class
(-)a/src/wifi/model/aparf-wifi-manager.cc (+20 lines)
 Lines 364-367   AparfWifiManager::IsLowLatency (void) const Link Here 
364
  return true;
364
  return true;
365
}
365
}
366
366
367
void
368
AparfWifiManager::SetHtSupported (bool enable)
369
{
370
  //HT is not supported by this algorithm.
371
  if (enable)
372
    {
373
      NS_FATAL_ERROR ("WifiRemoteStationManager selected does not support HT rates");
374
    }
375
}
376
377
void
378
AparfWifiManager::SetVhtSupported (bool enable)
379
{
380
  //VHT is not supported by this algorithm.
381
  if (enable)
382
    {
383
      NS_FATAL_ERROR ("WifiRemoteStationManager selected does not support VHT rates");
384
    }
385
}
386
367
} //namespace ns3
387
} //namespace ns3
(-)a/src/wifi/model/aparf-wifi-manager.h (+6 lines)
 Lines 38-43   struct AparfWifiRemoteStation; Link Here 
38
 * Networks, Springer, 2005, 12, 123-145.
38
 * Networks, Springer, 2005, 12, 123-145.
39
 * http://www.cs.mun.ca/~yzchen/papers/papers/rate_adaptation/80211_dynamic_rate_power_adjustment_chevillat_j2005.pdf
39
 * http://www.cs.mun.ca/~yzchen/papers/papers/rate_adaptation/80211_dynamic_rate_power_adjustment_chevillat_j2005.pdf
40
 *
40
 *
41
 * This RAA does not support HT or VHT modes and will error exit
42
 * if the user tries to configure this RAA with a Wi-Fi MAC that
43
 * has VhtSupported or HtSupported set.
41
 */
44
 */
42
class AparfWifiManager : public WifiRemoteStationManager
45
class AparfWifiManager : public WifiRemoteStationManager
43
{
46
{
 Lines 50-56   public: Link Here 
50
  AparfWifiManager ();
53
  AparfWifiManager ();
51
  virtual ~AparfWifiManager ();
54
  virtual ~AparfWifiManager ();
52
55
56
  // Inherited from WifiRemoteStationManager
53
  virtual void SetupPhy (Ptr<WifiPhy> phy);
57
  virtual void SetupPhy (Ptr<WifiPhy> phy);
58
  virtual void SetHtSupported (bool enable);
59
  virtual void SetVhtSupported (bool enable);
54
60
55
  /**
61
  /**
56
   * Enumeration of the possible states of the channel.
62
   * Enumeration of the possible states of the channel.
(-)a/src/wifi/model/arf-wifi-manager.cc (+20 lines)
 Lines 249-252   ArfWifiManager::IsLowLatency (void) const Link Here 
249
  return true;
249
  return true;
250
}
250
}
251
251
252
void
253
ArfWifiManager::SetHtSupported (bool enable)
254
{
255
  //HT is not supported by this algorithm.
256
  if (enable)
257
    {
258
      NS_FATAL_ERROR ("WifiRemoteStationManager selected does not support HT rates");
259
    }
260
}
261
262
void
263
ArfWifiManager::SetVhtSupported (bool enable)
264
{
265
  //VHT is not supported by this algorithm.
266
  if (enable)
267
    {
268
      NS_FATAL_ERROR ("WifiRemoteStationManager selected does not support VHT rates");
269
    }
270
}
271
252
} //namespace ns3
272
} //namespace ns3
(-)a/src/wifi/model/arf-wifi-manager.h (+7 lines)
 Lines 39-44   namespace ns3 { Link Here 
39
 * in XXX (I cannot find back the original paper which described how
39
 * in XXX (I cannot find back the original paper which described how
40
 * the time-based timer could be easily replaced with a packet-based
40
 * the time-based timer could be easily replaced with a packet-based
41
 * timer.)
41
 * timer.)
42
 *
43
 * This RAA does not support HT or VHT modes and will error exit
44
 * if the user tries to configure this RAA with a Wi-Fi MAC that
45
 * has VhtSupported or HtSupported set.
42
 */
46
 */
43
class ArfWifiManager : public WifiRemoteStationManager
47
class ArfWifiManager : public WifiRemoteStationManager
44
{
48
{
 Lines 47-52   public: Link Here 
47
  ArfWifiManager ();
51
  ArfWifiManager ();
48
  virtual ~ArfWifiManager ();
52
  virtual ~ArfWifiManager ();
49
53
54
  // Inherited from WifiRemoteStationManager
55
  virtual void SetHtSupported (bool enable);
56
  virtual void SetVhtSupported (bool enable);
50
57
51
private:
58
private:
52
  //overriden from base class
59
  //overriden from base class
(-)a/src/wifi/model/cara-wifi-manager.cc (+20 lines)
 Lines 232-235   CaraWifiManager::IsLowLatency (void) const Link Here 
232
  return true;
232
  return true;
233
}
233
}
234
234
235
void
236
CaraWifiManager::SetHtSupported (bool enable)
237
{
238
  //HT is not supported by this algorithm.
239
  if (enable)
240
    {
241
      NS_FATAL_ERROR ("WifiRemoteStationManager selected does not support HT rates");
242
    }
243
}
244
245
void
246
CaraWifiManager::SetVhtSupported (bool enable)
247
{
248
  //VHT is not supported by this algorithm.
249
  if (enable)
250
    {
251
      NS_FATAL_ERROR ("WifiRemoteStationManager selected does not support VHT rates");
252
    }
253
}
254
235
} //namespace ns3
255
} //namespace ns3
(-)a/src/wifi/model/cara-wifi-manager.h (+7 lines)
 Lines 35-40   namespace ns3 { Link Here 
35
 *
35
 *
36
 * Originally implemented by Federico Maguolo for a very early
36
 * Originally implemented by Federico Maguolo for a very early
37
 * prototype version of ns-3.
37
 * prototype version of ns-3.
38
 *
39
 * This RAA does not support HT or VHT modes and will error exit
40
 * if the user tries to configure this RAA with a Wi-Fi MAC that
41
 * has VhtSupported or HtSupported set.
38
 */
42
 */
39
class CaraWifiManager : public WifiRemoteStationManager
43
class CaraWifiManager : public WifiRemoteStationManager
40
{
44
{
 Lines 43-48   public: Link Here 
43
  CaraWifiManager ();
47
  CaraWifiManager ();
44
  virtual ~CaraWifiManager ();
48
  virtual ~CaraWifiManager ();
45
49
50
  // Inherited from WifiRemoteStationManager
51
  virtual void SetHtSupported (bool enable);
52
  virtual void SetVhtSupported (bool enable);
46
53
47
private:
54
private:
48
  //overriden from base class
55
  //overriden from base class
(-)a/src/wifi/model/minstrel-wifi-manager.cc (+21 lines)
 Lines 1071-1074   MinstrelWifiManager::PrintTable (MinstrelWifiRemoteStation *station) Link Here 
1071
  station->m_statsFile.flush ();
1071
  station->m_statsFile.flush ();
1072
}
1072
}
1073
1073
1074
1075
void
1076
MinstrelWifiManager::SetHtSupported (bool enable)
1077
{
1078
  //HT is not supported by this algorithm.
1079
  if (enable)
1080
    {
1081
      NS_FATAL_ERROR ("WifiRemoteStationManager selected does not support HT rates");
1082
    }
1083
}
1084
1085
void
1086
MinstrelWifiManager::SetVhtSupported (bool enable)
1087
{
1088
  //VHT is not supported by this algorithm.
1089
  if (enable)
1090
    {
1091
      NS_FATAL_ERROR ("WifiRemoteStationManager selected does not support VHT rates");
1092
    }
1093
}
1094
1074
} //namespace ns3
1095
} //namespace ns3
(-)a/src/wifi/model/minstrel-wifi-manager.h (+4 lines)
 Lines 124-129   struct MinstrelWifiRemoteStation : public WifiRemoteStation Link Here 
124
 *
124
 *
125
 * Minstrel is appropriate for non-HT/VHT configurations; for HT/VHT
125
 * Minstrel is appropriate for non-HT/VHT configurations; for HT/VHT
126
 * (i.e. 802.11n/ac), users should use MinstrelHtWifiManager instead.
126
 * (i.e. 802.11n/ac), users should use MinstrelHtWifiManager instead.
127
 * Minstrel will error exit if the user tries to configure it with a
128
 * Wi-Fi MAC that has VhtSupported or HtSupported set.
127
 *
129
 *
128
 * Some notes on this implementation follow.  The implementation has
130
 * Some notes on this implementation follow.  The implementation has
129
 * been adapted to bring it closer to the Linux implementation.
131
 * been adapted to bring it closer to the Linux implementation.
 Lines 161-166   public: Link Here 
161
  // Inherited from WifiRemoteStationManager
163
  // Inherited from WifiRemoteStationManager
162
  virtual void SetupPhy (Ptr<WifiPhy> phy);
164
  virtual void SetupPhy (Ptr<WifiPhy> phy);
163
  virtual void SetupMac (Ptr<WifiMac> mac);
165
  virtual void SetupMac (Ptr<WifiMac> mac);
166
  virtual void SetHtSupported (bool enable);
167
  virtual void SetVhtSupported (bool enable);
164
168
165
  /**
169
  /**
166
   * Assign a fixed random variable stream number to the random variables
170
   * Assign a fixed random variable stream number to the random variables
(-)a/src/wifi/model/onoe-wifi-manager.cc (+20 lines)
 Lines 315-318   OnoeWifiManager::IsLowLatency (void) const Link Here 
315
  return false;
315
  return false;
316
}
316
}
317
317
318
void
319
OnoeWifiManager::SetHtSupported (bool enable)
320
{
321
  //HT is not supported by this algorithm.
322
  if (enable)
323
    {
324
      NS_FATAL_ERROR ("WifiRemoteStationManager selected does not support HT rates");
325
    }
326
}
327
328
void
329
OnoeWifiManager::SetVhtSupported (bool enable)
330
{
331
  //VHT is not supported by this algorithm.
332
  if (enable)
333
    {
334
      NS_FATAL_ERROR ("WifiRemoteStationManager selected does not support VHT rates");
335
    }
336
}
337
318
} //namespace ns3
338
} //namespace ns3
(-)a/src/wifi/model/onoe-wifi-manager.h (+7 lines)
 Lines 38-43   struct OnoeWifiRemoteStation; Link Here 
38
 * rate control algorithm for the madwifi driver. I am not aware of
38
 * rate control algorithm for the madwifi driver. I am not aware of
39
 * any publication or reference about this algorithm beyond the madwifi
39
 * any publication or reference about this algorithm beyond the madwifi
40
 * source code.
40
 * source code.
41
 *
42
 * This RAA does not support HT or VHT modes and will error exit
43
 * if the user tries to configure this RAA with a Wi-Fi MAC that
44
 * has VhtSupported or HtSupported set.
41
 */
45
 */
42
class OnoeWifiManager : public WifiRemoteStationManager
46
class OnoeWifiManager : public WifiRemoteStationManager
43
{
47
{
 Lines 46-51   public: Link Here 
46
50
47
  OnoeWifiManager ();
51
  OnoeWifiManager ();
48
52
53
  // Inherited from WifiRemoteStationManager
54
  virtual void SetHtSupported (bool enable);
55
  virtual void SetVhtSupported (bool enable);
49
56
50
private:
57
private:
51
  //overriden from base class
58
  //overriden from base class
(-)a/src/wifi/model/parf-wifi-manager.cc (+20 lines)
 Lines 336-339   ParfWifiManager::IsLowLatency (void) const Link Here 
336
  return true;
336
  return true;
337
}
337
}
338
338
339
void
340
ParfWifiManager::SetHtSupported (bool enable)
341
{
342
  //HT is not supported by this algorithm.
343
  if (enable)
344
    {
345
      NS_FATAL_ERROR ("WifiRemoteStationManager selected does not support HT rates");
346
    }
347
}
348
349
void
350
ParfWifiManager::SetVhtSupported (bool enable)
351
{
352
  //VHT is not supported by this algorithm.
353
  if (enable)
354
    {
355
      NS_FATAL_ERROR ("WifiRemoteStationManager selected does not support VHT rates");
356
    }
357
}
358
339
} //namespace ns3
359
} //namespace ns3
(-)a/src/wifi/model/parf-wifi-manager.h (+6 lines)
 Lines 36-41   struct ParfWifiRemoteStation; Link Here 
36
 * Wireless Networks, Kluwer Academic Publishers, 2007, 13, 737-755
36
 * Wireless Networks, Kluwer Academic Publishers, 2007, 13, 737-755
37
 * http://www.cs.odu.edu/~nadeem/classes/cs795-WNS-S13/papers/enter-006.pdf
37
 * http://www.cs.odu.edu/~nadeem/classes/cs795-WNS-S13/papers/enter-006.pdf
38
 *
38
 *
39
 * This RAA does not support HT or VHT modes and will error exit
40
 * if the user tries to configure this RAA with a Wi-Fi MAC that
41
 * has VhtSupported or HtSupported set.
39
 */
42
 */
40
class ParfWifiManager : public WifiRemoteStationManager
43
class ParfWifiManager : public WifiRemoteStationManager
41
{
44
{
 Lines 48-54   public: Link Here 
48
  ParfWifiManager ();
51
  ParfWifiManager ();
49
  virtual ~ParfWifiManager ();
52
  virtual ~ParfWifiManager ();
50
53
54
  // Inherited from WifiRemoteStationManager
51
  virtual void SetupPhy (Ptr<WifiPhy> phy);
55
  virtual void SetupPhy (Ptr<WifiPhy> phy);
56
  virtual void SetHtSupported (bool enable);
57
  virtual void SetVhtSupported (bool enable);
52
58
53
59
54
private:
60
private:
(-)a/src/wifi/model/rraa-wifi-manager.cc (+20 lines)
 Lines 496-499   RraaWifiManager::IsLowLatency (void) const Link Here 
496
  return true;
496
  return true;
497
}
497
}
498
498
499
void
500
RraaWifiManager::SetHtSupported (bool enable)
501
{
502
  //HT is not supported by this algorithm.
503
  if (enable)
504
    {
505
      NS_FATAL_ERROR ("WifiRemoteStationManager selected does not support HT rates");
506
    }
507
}
508
509
void
510
RraaWifiManager::SetVhtSupported (bool enable)
511
{
512
  //VHT is not supported by this algorithm.
513
  if (enable)
514
    {
515
      NS_FATAL_ERROR ("WifiRemoteStationManager selected does not support VHT rates");
516
    }
517
}
518
499
} //namespace ns3
519
} //namespace ns3
(-)a/src/wifi/model/rraa-wifi-manager.h (+7 lines)
 Lines 36-41   struct RraaWifiRemoteStation; Link Here 
36
 * "Robust rate adaptation for 802.11 wireless networks"
36
 * "Robust rate adaptation for 802.11 wireless networks"
37
 * by "Starsky H. Y. Wong", "Hao Yang", "Songwu Lu", and,
37
 * by "Starsky H. Y. Wong", "Hao Yang", "Songwu Lu", and,
38
 * "Vaduvur Bharghavan" published in Mobicom 06.
38
 * "Vaduvur Bharghavan" published in Mobicom 06.
39
 *
40
 * This RAA does not support HT or VHT modes and will error exit
41
 * if the user tries to configure this RAA with a Wi-Fi MAC that
42
 * has VhtSupported or HtSupported set.
39
 */
43
 */
40
class RraaWifiManager : public WifiRemoteStationManager
44
class RraaWifiManager : public WifiRemoteStationManager
41
{
45
{
 Lines 45-50   public: Link Here 
45
  RraaWifiManager ();
49
  RraaWifiManager ();
46
  virtual ~RraaWifiManager ();
50
  virtual ~RraaWifiManager ();
47
51
52
  // Inherited from WifiRemoteStationManager
53
  virtual void SetHtSupported (bool enable);
54
  virtual void SetVhtSupported (bool enable);
48
55
49
private:
56
private:
50
  struct ThresholdsItem
57
  struct ThresholdsItem
(-)a/src/wifi/model/wifi-remote-station-manager.h (-2 / +2 lines)
 Lines 187-193   public: Link Here 
187
   *
187
   *
188
   * \param enable enable or disable HT capability support
188
   * \param enable enable or disable HT capability support
189
   */
189
   */
190
  void SetHtSupported (bool enable);
190
  virtual void SetHtSupported (bool enable);
191
  /**
191
  /**
192
   * Return whether the device has HT capability support enabled.
192
   * Return whether the device has HT capability support enabled.
193
   *
193
   *
 Lines 199-205   public: Link Here 
199
   *
199
   *
200
   * \param enable enable or disable VHT capability support
200
   * \param enable enable or disable VHT capability support
201
   */
201
   */
202
  void SetVhtSupported (bool enable);
202
  virtual void SetVhtSupported (bool enable);
203
  /**
203
  /**
204
   * Return whether the device has VHT capability support enabled.
204
   * Return whether the device has VHT capability support enabled.
205
   *
205
   *

Return to bug 1797