equal
deleted
inserted
replaced
312 Configure80211n_2_4Ghz (); |
312 Configure80211n_2_4Ghz (); |
313 break; |
313 break; |
314 case WIFI_PHY_STANDARD_80211n_5GHZ: |
314 case WIFI_PHY_STANDARD_80211n_5GHZ: |
315 Configure80211n_5Ghz (); |
315 Configure80211n_5Ghz (); |
316 break; |
316 break; |
|
317 case WIFI_PHY_STANDARD_80211ac: |
|
318 Configure80211ac (); |
|
319 break; |
317 default: |
320 default: |
318 NS_ASSERT (false); |
321 NS_ASSERT (false); |
319 break; |
322 break; |
320 } |
323 } |
321 FinishConfigureStandard (standard); |
324 FinishConfigureStandard (standard); |
393 SetBasicBlockAckTimeout (GetSifs () + GetSlot () + GetDefaultBasicBlockAckDelay () + GetDefaultMaxPropagationDelay () * 2); |
396 SetBasicBlockAckTimeout (GetSifs () + GetSlot () + GetDefaultBasicBlockAckDelay () + GetDefaultMaxPropagationDelay () * 2); |
394 SetCompressedBlockAckTimeout (GetSifs () + GetSlot () + GetDefaultCompressedBlockAckDelay () + GetDefaultMaxPropagationDelay () * 2); |
397 SetCompressedBlockAckTimeout (GetSifs () + GetSlot () + GetDefaultCompressedBlockAckDelay () + GetDefaultMaxPropagationDelay () * 2); |
395 } |
398 } |
396 |
399 |
397 void |
400 void |
|
401 WifiMac::Configure80211ac (void) |
|
402 { |
|
403 Configure80211n_5Ghz (); |
|
404 } |
|
405 |
|
406 void |
398 WifiMac::ConfigureDcf (Ptr<Dcf> dcf, uint32_t cwmin, uint32_t cwmax, enum AcIndex ac) |
407 WifiMac::ConfigureDcf (Ptr<Dcf> dcf, uint32_t cwmin, uint32_t cwmax, enum AcIndex ac) |
399 { |
408 { |
400 /* see IEE802.11 section 7.3.2.29 */ |
409 /* see IEE802.11 section 7.3.2.29 */ |
401 switch (ac) |
410 switch (ac) |
402 { |
411 { |