Skip to content

Commit

Permalink
Merge branch 'main' into bugfix/fix-spinel-rcp-caps
Browse files Browse the repository at this point in the history
  • Loading branch information
lmnotran committed Apr 23, 2024
2 parents a45747b + de9f978 commit 89656ee
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions src/core/utils/mesh_diag.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ Error MeshDiag::DiscoverTopology(const DiscoverConfig &aConfig, DiscoverCallback
}

mDiscover.mCallback.Set(aCallback, aContext);
mState = kStateDicoverTopology;
mState = kStateDiscoverTopology;
mTimer.Start(kResponseTimeout);

exit:
Expand All @@ -133,7 +133,7 @@ void MeshDiag::HandleDiagGetResponse(Coap::Message *aMessage, const Ip6::Message

SuccessOrExit(aResult);
VerifyOrExit(aMessage != nullptr);
VerifyOrExit(mState == kStateDicoverTopology);
VerifyOrExit(mState == kStateDiscoverTopology);

SuccessOrExit(routerInfo.ParseFrom(*aMessage));

Expand Down Expand Up @@ -437,7 +437,7 @@ void MeshDiag::Cancel(void)
case kStateQueryRouterNeighborTable:
break;

case kStateDicoverTopology:
case kStateDiscoverTopology:
IgnoreError(Get<Tmf::Agent>().AbortTransaction(HandleDiagGetResponse, this));
break;
}
Expand All @@ -460,7 +460,7 @@ void MeshDiag::Finalize(Error aError)
case kStateIdle:
break;

case kStateDicoverTopology:
case kStateDiscoverTopology:
mDiscover.mCallback.InvokeIfSet(aError, nullptr);
break;

Expand Down
2 changes: 1 addition & 1 deletion src/core/utils/mesh_diag.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ class MeshDiag : public InstanceLocator
enum State : uint8_t
{
kStateIdle,
kStateDicoverTopology,
kStateDiscoverTopology,
kStateQueryChildTable,
kStateQueryChildrenIp6Addrs,
kStateQueryRouterNeighborTable,
Expand Down

0 comments on commit 89656ee

Please sign in to comment.