F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove comparison that is always true due to limited range of data type

Browse Source
This commit is contained in:
Tom Henderson
2012-07-04 21:29:55 -07:00
parent 8f70c1a43f
commit e9dc5fbd4c
1 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/lr-wpan/model/lr-wpan-mac.cc
View File

@@ -217,22 +217,8 @@ LrWpanMac::McpsDataRequest (McpsDataRequestParams params, Ptr<Packet> 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;