From 3535176535e5f027b8c8f65fb61fc272b9c4bfdb Mon Sep 17 00:00:00 2001 From: Rongli Sun Date: Sun, 29 Mar 2020 00:07:19 +0800 Subject: [PATCH] [core] remove useless code for the old mLinkLocal16 (removed in #913) (#4750) --- src/core/thread/mesh_forwarder.cpp | 7 ------- src/core/thread/mle_router.cpp | 10 +--------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/core/thread/mesh_forwarder.cpp b/src/core/thread/mesh_forwarder.cpp index 67b937586..e6051232d 100644 --- a/src/core/thread/mesh_forwarder.cpp +++ b/src/core/thread/mesh_forwarder.cpp @@ -372,13 +372,6 @@ void MeshForwarder::GetMacDestinationAddress(const Ip6::Address &aIp6Addr, Mac:: { aMacAddr.SetShort(Mac::kShortAddrBroadcast); } - else if (aIp6Addr.mFields.m16[0] == HostSwap16(0xfe80) && aIp6Addr.mFields.m16[1] == HostSwap16(0x0000) && - aIp6Addr.mFields.m16[2] == HostSwap16(0x0000) && aIp6Addr.mFields.m16[3] == HostSwap16(0x0000) && - aIp6Addr.mFields.m16[4] == HostSwap16(0x0000) && aIp6Addr.mFields.m16[5] == HostSwap16(0x00ff) && - aIp6Addr.mFields.m16[6] == HostSwap16(0xfe00)) - { - aMacAddr.SetShort(aIp6Addr.GetLocator()); - } else if (Get().IsRoutingLocator(aIp6Addr)) { aMacAddr.SetShort(aIp6Addr.GetLocator()); diff --git a/src/core/thread/mle_router.cpp b/src/core/thread/mle_router.cpp index 59573ecf3..e0c6461e3 100644 --- a/src/core/thread/mle_router.cpp +++ b/src/core/thread/mle_router.cpp @@ -3404,15 +3404,7 @@ Neighbor *MleRouter::GetNeighbor(const Ip6::Address &aAddress) if (aAddress.IsLinkLocal()) { - if (aAddress.mFields.m16[4] == HostSwap16(0x0000) && aAddress.mFields.m16[5] == HostSwap16(0x00ff) && - aAddress.mFields.m16[6] == HostSwap16(0xfe00)) - { - macAddr.SetShort(aAddress.GetLocator()); - } - else - { - aAddress.ToExtAddress(macAddr); - } + aAddress.ToExtAddress(macAddr); ExitNow(rval = GetNeighbor(macAddr)); }