From ed6d1cfe8603d3af880bc9f66c228c37a13d44cb Mon Sep 17 00:00:00 2001 From: Ethan Zuo Date: Mon, 21 Oct 2024 15:21:29 +0000 Subject: [PATCH] mt_wifi: fix wrong return type This fixes the error that occurred when compiling with GCC 10. The return type of ExtEventPhyIcsUnSolicitDataHandler is void so we cannot return NDIS_STATUS_FAILURE here. Signed-off-by: Ethan Zuo --- .../mt_wifi/patches-7661/021-fix-return-type.patch | 11 +++++++++++ .../mt_wifi/patches-7672/021-fix-return-type.patch | 11 +++++++++++ 2 files changed, 22 insertions(+) create mode 100644 package/mtk/drivers/mt_wifi/patches-7661/021-fix-return-type.patch create mode 100644 package/mtk/drivers/mt_wifi/patches-7672/021-fix-return-type.patch diff --git a/package/mtk/drivers/mt_wifi/patches-7661/021-fix-return-type.patch b/package/mtk/drivers/mt_wifi/patches-7661/021-fix-return-type.patch new file mode 100644 index 0000000000..d6f63016a8 --- /dev/null +++ b/package/mtk/drivers/mt_wifi/patches-7661/021-fix-return-type.patch @@ -0,0 +1,11 @@ +--- a/mt_wifi/embedded/mcu/andes_mt.c 2022-11-27 21:58:55.000000000 +0800 ++++ b/mt_wifi/embedded/mcu/andes_mt.c 2024-05-07 12:56:43.337033430 +0800 +@@ -1359,7 +1359,7 @@ VOID ExtEventPhyIcsUnSolicitDataHandler( + msg_len = pIcsEvent->u4DataLen * sizeof(UINT32) + sizeof(FW_BIN_LOG_HDR_T); + + if (os_alloc_mem(pAd, (UCHAR **)&buffer, msg_len) != NDIS_STATUS_SUCCESS) +- return NDIS_STATUS_FAILURE; ++ return; + log_hdr = (P_FW_BIN_LOG_HDR_T)buffer; + + /* prepare ICS header */ diff --git a/package/mtk/drivers/mt_wifi/patches-7672/021-fix-return-type.patch b/package/mtk/drivers/mt_wifi/patches-7672/021-fix-return-type.patch new file mode 100644 index 0000000000..d6f63016a8 --- /dev/null +++ b/package/mtk/drivers/mt_wifi/patches-7672/021-fix-return-type.patch @@ -0,0 +1,11 @@ +--- a/mt_wifi/embedded/mcu/andes_mt.c 2022-11-27 21:58:55.000000000 +0800 ++++ b/mt_wifi/embedded/mcu/andes_mt.c 2024-05-07 12:56:43.337033430 +0800 +@@ -1359,7 +1359,7 @@ VOID ExtEventPhyIcsUnSolicitDataHandler( + msg_len = pIcsEvent->u4DataLen * sizeof(UINT32) + sizeof(FW_BIN_LOG_HDR_T); + + if (os_alloc_mem(pAd, (UCHAR **)&buffer, msg_len) != NDIS_STATUS_SUCCESS) +- return NDIS_STATUS_FAILURE; ++ return; + log_hdr = (P_FW_BIN_LOG_HDR_T)buffer; + + /* prepare ICS header */