From: janhauer <janhauer>
Date: Mon, 18 May 2009 17:16:25 +0000 (+0000)
Subject: Fixed a typo (macPanID was read incorrectly)
X-Git-Tag: rc_6_tinyos_2_1_1~382
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=98cba9d7d993373d4e16e6282eb48decc8791fd5

Fixed a typo (macPanID was read incorrectly)
---

diff --git a/tos/lib/mac/tkn154/BeaconRequestRxP.nc b/tos/lib/mac/tkn154/BeaconRequestRxP.nc
index d9ae1e90..dec823a1 100644
--- a/tos/lib/mac/tkn154/BeaconRequestRxP.nc
+++ b/tos/lib/mac/tkn154/BeaconRequestRxP.nc
@@ -94,7 +94,7 @@ implementation
     m_beaconFrame.header->mhr[MHR_INDEX_FC1] = FC1_FRAMETYPE_BEACON;
     m_beaconFrame.header->mhr[MHR_INDEX_FC2] = isShortAddr ? FC2_SRC_MODE_SHORT : FC2_SRC_MODE_EXTENDED;
     offset = MHR_INDEX_ADDRESS;
-    *((nxle_uint16_t*) &m_beaconFrame.header->mhr[offset]) = PAN_ID;
+    *((nxle_uint16_t*) &m_beaconFrame.header->mhr[offset]) = call MLME_GET.macPANId();
     offset += sizeof(ieee154_macPANId_t);
     if (isShortAddr) {
       *((nxle_uint16_t*) &m_beaconFrame.header->mhr[offset]) = shortAddress;