From c856c57fe5801f23ec7b8ebd38b81c1c4833f9ca Mon Sep 17 00:00:00 2001 From: Alberto Gallegos Ramonet Date: Fri, 28 Jun 2024 10:31:52 +0900 Subject: [PATCH] lr-wpan: MAC layer AssignStreams function fixes --- CHANGES.md | 5 ++++- src/lr-wpan/model/lr-wpan-mac.cc | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index cfb070e7a..978790e8c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -19,14 +19,17 @@ Changes from ns-3.42 to ns-3-dev ### New API ### Changes to existing API + * (lr-wpan) Attribute `macBeaconPayload` in `MacPibAttributes` is now a std::vector instead of a packet pointer. * (lr-wpan) Removes the word `address` from the MAC address prefix when `LOG_PREFIX_FUNC` is used. * (lr-wpan) Removes the word `address` from the CSMA-CA logs prefix when `LOG_PREFIX_FUNC` is used. -* (wifi) The `WifiHelper::AssignStreams()` method has been made static +* (wifi) The `WifiHelper::AssignStreams()` method has been made static. +* (lr-wpan) Added `AssignStreams` function to the MAC. ### Changes to build system ### Changed behavior + * (lr-wpan) Beacons are now transmitted using CSMA-CA when requested from a beacon request command. * (lr-wpan) Upon a beacon request command, beacons are transmitted after a jitter to reduce the probability of collisions. diff --git a/src/lr-wpan/model/lr-wpan-mac.cc b/src/lr-wpan/model/lr-wpan-mac.cc index 88b0e66fa..88d4feb37 100644 --- a/src/lr-wpan/model/lr-wpan-mac.cc +++ b/src/lr-wpan/model/lr-wpan-mac.cc @@ -3006,8 +3006,8 @@ LrWpanMac::AssignStreams(int64_t stream) { NS_LOG_FUNCTION(this); m_uniformVar->SetStream(stream); - m_csmaCa->AssignStreams(stream); - return 1; + m_csmaCa->AssignStreams(stream + 1); + return 2; } void