mwlwifi: update to version 10.4.10-20231120

[openwrt/staging/blocktrron.git] / package / kernel / mwlwifi / patches / 001-Fix-compilation-warning-with-64-bit-system.patch

diff --git a/package/kernel/mwlwifi/patches/001-Fix-compilation-warning-with-64-bit-system.patch b/package/kernel/mwlwifi/patches/001-Fix-compilation-warning-with-64-bit-system.patch
index 8e71918cf3f828610676010467577ea4d5faa0f8..80e708a5e18ae62f0e0cc18da27cc22aa0d11963 100644 (file)
--- a/package/kernel/mwlwifi/patches/001-Fix-compilation-warning-with-64-bit-system.patch
+++ b/package/kernel/mwlwifi/patches/001-Fix-compilation-warning-with-64-bit-system.patch
@@ -117,11 +117,9 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
  hif/pcie/tx_ndp.c | 2 +-
  4 files changed, 5 insertions(+), 5 deletions(-)
 
-diff --git a/debugfs.c b/debugfs.c
-index 39b09fd..42efd28 100644
 --- a/debugfs.c
 +++ b/debugfs.c
-@@ -1332,7 +1332,7 @@ done:
+@@ -1342,7 +1342,7 @@ done:
                                 priv->reg_value);
        else
                len += scnprintf(p + len, size - len,
@@ -130,11 +128,9 @@ index 39b09fd..42efd28 100644
                                 ret, priv->reg_type, priv->reg_offset,
                                 priv->reg_value);
  
-diff --git a/hif/fwcmd.c b/hif/fwcmd.c
-index 376b58f..582c8d2 100644
 --- a/hif/fwcmd.c
 +++ b/hif/fwcmd.c
-@@ -3604,7 +3604,7 @@ int mwl_fwcmd_get_fw_core_dump(struct ieee80211_hw *hw,
+@@ -3623,7 +3623,7 @@ int mwl_fwcmd_get_fw_core_dump(struct ie
        core_dump->size_kb = pcmd->cmd_data.coredump.size_kb;
        core_dump->flags = pcmd->cmd_data.coredump.flags;
        memcpy(buff,
@@ -143,11 +139,20 @@ index 376b58f..582c8d2 100644
               sizeof(struct hostcmd_cmd_get_fw_core_dump) -
               sizeof(struct hostcmd_cmd_get_fw_core_dump_)),
               MAX_CORE_DUMP_BUFFER);
-diff --git a/hif/pcie/pcie.c b/hif/pcie/pcie.c
-index 24453b6..5b6c633 100644
+--- a/hif/pcie/8964/tx_ndp.c
++++ b/hif/pcie/8964/tx_ndp.c
+@@ -336,7 +336,7 @@ int pcie_tx_init_ndp(struct ieee80211_hw
+ 
+       if (sizeof(struct pcie_tx_ctrl_ndp) >
+           sizeof(tx_info->driver_data)) {
+-              wiphy_err(hw->wiphy, "driver data is not enough: %d (%d)\n",
++              wiphy_err(hw->wiphy, "driver data is not enough: %zu (%zu)\n",
+                         sizeof(struct pcie_tx_ctrl_ndp),
+                         sizeof(tx_info->driver_data));
+               return -ENOMEM;
 --- a/hif/pcie/pcie.c
 +++ b/hif/pcie/pcie.c
-@@ -1320,8 +1320,8 @@ static void pcie_bf_mimo_ctrl_decode(struct mwl_priv *priv,
+@@ -1464,8 +1464,8 @@ static void pcie_bf_mimo_ctrl_decode(str
                               &fp_data->f_pos);
                filp_close(fp_data, current->files);
        } else {
@@ -158,19 +163,3 @@ index 24453b6..5b6c633 100644
        }
  
  #if LINUX_VERSION_CODE < KERNEL_VERSION(5,10,0)
-diff --git a/hif/pcie/tx_ndp.c b/hif/pcie/tx_ndp.c
-index 6758cde..3140a2e 100644
---- a/hif/pcie/tx_ndp.c
-+++ b/hif/pcie/tx_ndp.c
-@@ -335,7 +335,7 @@ int pcie_tx_init_ndp(struct ieee80211_hw *hw)
- 
-       if (sizeof(struct pcie_tx_ctrl_ndp) >
-           sizeof(tx_info->status.status_driver_data)) {
--              wiphy_err(hw->wiphy, "driver data is not enough: %d (%d)\n",
-+              wiphy_err(hw->wiphy, "driver data is not enough: %zu (%zu)\n",
-                         sizeof(struct pcie_tx_ctrl_ndp),
-                         sizeof(tx_info->status.status_driver_data));
-               return -ENOMEM;
--- 
-2.39.2
-