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

(-)a/src/wifi/model/wifi-phy.cc (-4 / +4 lines)
 Lines 480-490    Link Here 
480
        //Add signal extension for ERP PHY
480
        //Add signal extension for ERP PHY
481
        if (payloadMode.GetModulationClass () == WIFI_MOD_CLASS_ERP_OFDM)
481
        if (payloadMode.GetModulationClass () == WIFI_MOD_CLASS_ERP_OFDM)
482
          {
482
          {
483
            return NanoSeconds (numSymbols * symbolDuration.GetNanoSeconds ()) + MicroSeconds (6);
483
            return FemtoSeconds (numSymbols * symbolDuration.GetFemtoSeconds ()) + MicroSeconds (6);
484
          }
484
          }
485
        else
485
        else
486
          {
486
          {
487
            return NanoSeconds (numSymbols * symbolDuration.GetNanoSeconds ());
487
            return FemtoSeconds (numSymbols * symbolDuration.GetFemtoSeconds ());
488
          }
488
          }
489
      }
489
      }
490
    case WIFI_MOD_CLASS_HT:
490
    case WIFI_MOD_CLASS_HT:
 Lines 672-682    Link Here 
672
672
673
        if (payloadMode.GetModulationClass () == WIFI_MOD_CLASS_HT && frequency >= 2400 && frequency <= 2500 && ((mpdutype == NORMAL_MPDU && preamble != WIFI_PREAMBLE_NONE) || (mpdutype == LAST_MPDU_IN_AGGREGATE && preamble == WIFI_PREAMBLE_NONE))) //at 2.4 GHz
673
        if (payloadMode.GetModulationClass () == WIFI_MOD_CLASS_HT && frequency >= 2400 && frequency <= 2500 && ((mpdutype == NORMAL_MPDU && preamble != WIFI_PREAMBLE_NONE) || (mpdutype == LAST_MPDU_IN_AGGREGATE && preamble == WIFI_PREAMBLE_NONE))) //at 2.4 GHz
674
          {
674
          {
675
            return NanoSeconds (numSymbols * symbolDuration.GetNanoSeconds ()) + MicroSeconds (6);
675
            return FemtoSeconds (numSymbols * symbolDuration.GetFemtoSeconds ()) + MicroSeconds (6);
676
          }
676
          }
677
        else //at 5 GHz
677
        else //at 5 GHz
678
          {
678
          {
679
            return NanoSeconds (numSymbols * symbolDuration.GetNanoSeconds ());
679
            return FemtoSeconds (numSymbols * symbolDuration.GetFemtoSeconds ());
680
          }
680
          }
681
      }
681
      }
682
    case WIFI_MOD_CLASS_DSSS:
682
    case WIFI_MOD_CLASS_DSSS:

Return to bug 2421