diff --git a/CHANGES.md b/CHANGES.md index e07d3d182..c141a8f5a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -49,8 +49,8 @@ Changes from ns-3.36 to ns-3.37 * Adds support for **LrWpanMac** devices association. * Pan Id compression is now possible in **LrWpanMac** when transmitting data frames. i.e. When src and dst pan ID are the same, only one PanId is used, making the MAC header 2 bytes smaller. See IEEE 802.15.4-2006 (7.5.6.1). * Add O2I Low/High Building Penetration Losses in 3GPP propagation loss model (`ThreeGppPropagationLossModel`) according to **3GPP TR 38.901 7.4.3.1**. Currently, UMa, UMi and RMa scenarios are supported. -* Replace **LrWpanMac** Tx Queue and Ind Tx Queue pointers for smart pointers. -* Add **LrWpanMac** packet traces and queue limits to Tx queue and Ind Tx queue. +* Replace **LrWpanMac** Tx Queue and Ind Tx Queue pointers for smart pointers. +* Add **LrWpanMac** packet traces and queue limits to Tx queue and Ind Tx queue. ### Changes to build system diff --git a/build-support/macros-and-definitions.cmake b/build-support/macros-and-definitions.cmake index feb87e2df..a32e3af9e 100644 --- a/build-support/macros-and-definitions.cmake +++ b/build-support/macros-and-definitions.cmake @@ -2020,12 +2020,12 @@ function(find_external_library) set(not_found_libraries) set(library_dirs) set(libraries) - + # Include parent directories in the search paths to handle Bake cases get_filename_component(parent_project_dir ${PROJECT_SOURCE_DIR} DIRECTORY) get_filename_component(grandparent_project_dir ${parent_project_dir} DIRECTORY) set(project_parent_dirs ${parent_project_dir} ${grandparent_project_dir}) - + # Paths and suffixes where libraries will be searched on set(library_search_paths diff --git a/src/lr-wpan/doc/lr-wpan.rst b/src/lr-wpan/doc/lr-wpan.rst index 5c312f0fc..8c92a2f5a 100644 --- a/src/lr-wpan/doc/lr-wpan.rst +++ b/src/lr-wpan/doc/lr-wpan.rst @@ -178,7 +178,7 @@ Bootstrap as whole depends on procedures that also take place on higher layers o MAC queues ++++++++++ -By default, ``Tx queue`` and ``Ind Tx queue`` (the pending transaction list) are not limited but they can configure to drop packets after they +By default, ``Tx queue`` and ``Ind Tx queue`` (the pending transaction list) are not limited but they can configure to drop packets after they reach a limit of elements (transaction overflow). Additionally, the ``Ind Tx queue`` drop packets when the packet has been longer than ``macTransactionPersistenceTime`` (transaction expiration). Expiration of packets in the Tx queue is not supported. Finally, packets in the ``Tx queue`` may be dropped due to excessive transmission retries or channel access failure.