wifi: mwifiex: Support firmware hotfix version in GET_HW_SPEC responses

Support the firmware hotfix version in GET_HW_SPEC responses to avoid an
irritating "Unknown api_id: 5" message on probe.

Based on this commit in NXP's GPLv2-licensed out-of-tree driver:
https://github.com/nxp-imx/mwifiex/commit/27fd8ecca504

Signed-off-by: Lukas Wunner <lukas@wunner.de>
Cc: Sherry Sun <sherry.sun@nxp.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/111c7ee895f12d951e95a2edcd06d87ca26a7d0f.1674827105.git.lukas@wunner.de

diff --git a/drivers/net/wireless/marvell/mwifiex/cmdevt.c b/drivers/net/wireless/marvell/mwifiex/cmdevt.c
index d3339d67e7a08290221c3753a27b3abda9680f56..3756aa247e77d3813a16d74ab280cbd6fdd306d3 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/cmdevt.c
+++ b/drivers/net/wireless/marvell/mwifiex/cmdevt.c
@@ -1607,6 +1607,11 @@ int mwifiex_ret_get_hw_spec(struct mwifiex_private *priv,
                                                    api_rev->major_ver,
                                                    api_rev->minor_ver);
                                        break;
+                               case FW_HOTFIX_VER_ID:
+                                       mwifiex_dbg(adapter, INFO,
+                                                   "Firmware hotfix version %d\n",
+                                                   api_rev->major_ver);
+                                       break;
                                default:
                                        mwifiex_dbg(adapter, FATAL,
                                                    "Unknown api_id: %d\n",

diff --git a/drivers/net/wireless/marvell/mwifiex/fw.h b/drivers/net/wireless/marvell/mwifiex/fw.h
index b4f945a549f71ce7711601d166431cf75fe57994..c32478dfe3574f226d2ec4617c2ef5e0c86138fb 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/fw.h
+++ b/drivers/net/wireless/marvell/mwifiex/fw.h
@@ -1048,6 +1048,7 @@ enum API_VER_ID {
        FW_API_VER_ID = 2,
        UAP_FW_API_VER_ID = 3,
        CHANRPT_API_VER_ID = 4,
+       FW_HOTFIX_VER_ID = 5,
 };
 
 struct hw_spec_api_rev {