From e9dc5fbd4ccd645727f0ec37516eca87f8aa4061 Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Wed, 4 Jul 2012 21:29:55 -0700 Subject: [PATCH] remove comparison that is always true due to limited range of data type --- src/lr-wpan/model/lr-wpan-mac.cc | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/src/lr-wpan/model/lr-wpan-mac.cc b/src/lr-wpan/model/lr-wpan-mac.cc index e8530448c..182d1b905 100644 --- a/src/lr-wpan/model/lr-wpan-mac.cc +++ b/src/lr-wpan/model/lr-wpan-mac.cc @@ -217,22 +217,8 @@ LrWpanMac::McpsDataRequest (McpsDataRequestParams params, Ptr p) return; } - if ((params.m_dstAddrMode >= NO_PANID_ADDR) - && (params.m_dstAddrMode <= EXT_ADDR)) - { - macHdr.SetDstAddrMode (params.m_dstAddrMode); - macHdr.SetDstAddrFields (params.m_dstPanId, params.m_dstAddr); - } - else - { - NS_LOG_ERROR (this << " Can not send packet with incorrect Destination Address mode" << params.m_dstAddrMode); - confirmParams.m_status = IEEE_802_15_4_INVALID_ADDRESS; - if (!m_mcpsDataConfirmCallback.IsNull ()) - { - m_mcpsDataConfirmCallback (confirmParams); - } - return; - } + macHdr.SetDstAddrMode (params.m_dstAddrMode); + macHdr.SetDstAddrFields (params.m_dstPanId, params.m_dstAddr); macHdr.SetSecDisable (); //extract the last 3 bits in TxOptions and map to macHdr int b0 = params.m_txOptions & 1;