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

(-)ns-allinone-3.22/ns-3.22/src/wimax/model/bs-scheduler.cc (-1 / +2 lines)
 Lines 109-115   BSScheduler::CheckForFragmentation (Ptr< Link Here 
109
  if (availableByte > headerSize)
109
  if (availableByte > headerSize)
110
    {
110
    {
111
      NS_LOG_INFO ("\t Fragmentation IS possible");
111
      NS_LOG_INFO ("\t Fragmentation IS possible");
112
      return true;
112
      return false;
113
      //return true;
113
    }
114
    }
114
  else
115
  else
115
    {
116
    {
(-)ns-allinone-3.22/ns-3.22/src/wimax/model/simple-ofdm-wimax-phy.cc (-8 / +8 lines)
 Lines 885-914   SimpleOfdmWimaxPhy::DoGetFrameDuration ( Link Here 
885
  switch (frameDurationCode)
885
  switch (frameDurationCode)
886
    {
886
    {
887
    case FRAME_DURATION_2_POINT_5_MS:
887
    case FRAME_DURATION_2_POINT_5_MS:
888
      return Seconds (2.5);
888
      return MilliSeconds (2.5);
889
      break;
889
      break;
890
    case FRAME_DURATION_4_MS:
890
    case FRAME_DURATION_4_MS:
891
      return Seconds (4);
891
      return MilliSeconds (4);
892
      break;
892
      break;
893
    case FRAME_DURATION_5_MS:
893
    case FRAME_DURATION_5_MS:
894
      return Seconds (5);
894
      return MilliSeconds (5);
895
      break;
895
      break;
896
    case FRAME_DURATION_8_MS:
896
    case FRAME_DURATION_8_MS:
897
      return Seconds (8);
897
      return MilliSeconds (8);
898
      break;
898
      break;
899
    case FRAME_DURATION_10_MS:
899
    case FRAME_DURATION_10_MS:
900
      return Seconds (10);
900
      return MilliSeconds (10);
901
      break;
901
      break;
902
    case FRAME_DURATION_12_POINT_5_MS:
902
    case FRAME_DURATION_12_POINT_5_MS:
903
      return Seconds (12.5);
903
      return MilliSeconds (12.5);
904
      break;
904
      break;
905
    case FRAME_DURATION_20_MS:
905
    case FRAME_DURATION_20_MS:
906
      return Seconds (20);
906
      return MilliSeconds (20);
907
      break;
907
      break;
908
    default:
908
    default:
909
      NS_FATAL_ERROR ("Invalid modulation type");
909
      NS_FATAL_ERROR ("Invalid modulation type");
910
    }
910
    }
911
  return Seconds (0);
911
  return MilliSeconds (0);
912
}
912
}
913
913
914
/*
914
/*

Return to bug 1790