From cf58160c35f57ebaa0020b3a4c1520b741be651f Mon Sep 17 00:00:00 2001
From: Josh Gao <josh_gao@foxmail.com>
Date: Wed, 28 May 2025 14:35:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=8C=85=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E5=87=BD=E6=95=B0=E4=BC=A0=E5=8F=82,=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=B8=A7=E7=B1=BB=E5=9E=8B=E5=8F=82=E6=95=B0,=20?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=BB=8E=E6=95=B0=E6=8D=AE=E5=8C=85=E4=B8=AD?=
 =?UTF-8?q?=E8=AF=BB=E5=8F=96=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/networking/link_layer/link_layer.c | 9 ++++++---
 src/networking/link_layer/link_layer.h | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/networking/link_layer/link_layer.c b/src/networking/link_layer/link_layer.c
index e6427f4..e2ba200 100644
--- a/src/networking/link_layer/link_layer.c
+++ b/src/networking/link_layer/link_layer.c
@@ -366,6 +366,7 @@ inline uint32_t L2_GetNextFrameNum(L2_INST *instPtr)
 	ASSERT(instPtr != NULL);
 	return instPtr->frameNum.next;
 }
+
 /**
  * @brief   Get next slot number.
  */
@@ -921,12 +922,11 @@ int32_t Linklayer_EventHandler(L2_INST *instPtr, const L2_EVENT *l2Event)
  * @brief   Handle l2 packet correctly received.
  *
  * @param   instPtr		a pointer to physical layer controller instance
- * @param   frameType
  *
  * @return  Status code.
  *
  ******************************************************************************/
-int32_t Linklayer_PktHandler(L2_INST *instPtr, L2_FRAME_TYPE frameType)
+int32_t Linklayer_PktHandler(L2_INST *instPtr)
 {
 	ASSERT(instPtr != NULL);
 	int32_t Status;
@@ -936,6 +936,9 @@ int32_t Linklayer_PktHandler(L2_INST *instPtr, L2_FRAME_TYPE frameType)
 		return FAILURE;
 	}
 
+	L2_MSG_COMMON *msg = (L2_MSG_COMMON *) instPtr->recvPktData;
+	L2_FRAME_TYPE frameType = msg->msgType;
+
 	switch (frameType)
 	{
 	case L2_FRAME_ADV:
@@ -1113,7 +1116,7 @@ int32_t Linklayer_Proc(L2_INST *instPtr)
 	// Handle frame received in last slot.
 	if (L2_isDataAvail(instPtr) == true)
 	{
-		if (Linklayer_PktHandler(instPtr, L2_GetLastFrameType(instPtr)) != SUCCESS)
+		if (Linklayer_PktHandler(instPtr) != SUCCESS)
 		{
 			DBG_ERROR("Failed to handle last received frame: %" PRId8 ".\n", L2_GetLastFrameType(instPtr));
 		}
diff --git a/src/networking/link_layer/link_layer.h b/src/networking/link_layer/link_layer.h
index 240c8be..6856bde 100644
--- a/src/networking/link_layer/link_layer.h
+++ b/src/networking/link_layer/link_layer.h
@@ -142,7 +142,7 @@ int32_t Linklayer_Start(L2_INST *instPtr);
 int32_t Linklayer_Halt(L2_INST *instPtr);
 int32_t Linklayer_Proc(L2_INST *instPtr);
 int32_t Linklayer_EventHandler(L2_INST *instPtr, const L2_EVENT *l2Event);
-int32_t Linklayer_PktHandler(L2_INST *instPtr, L2_FRAME_TYPE frameType);
+int32_t Linklayer_PktHandler(L2_INST *instPtr);
 int32_t L2_SetupNextSlot(L2_INST *instPtr, L2_TOR_TYPE txrxMode, L2_FRAME_TYPE frameType);
 /** @} LinkLayer_Main*/