mac80211: update to linux 6.1-rc8

[openwrt/openwrt.git] / package / kernel / mac80211 / patches / mwl / 950-mwifiex-Print-stringified-name-of-command-in-error-l.patch

diff --git a/package/kernel/mac80211/patches/mwl/950-mwifiex-Print-stringified-name-of-command-in-error-l.patch b/package/kernel/mac80211/patches/mwl/950-mwifiex-Print-stringified-name-of-command-in-error-l.patch
index 396e66ac22ee0b225fa0352993a3bc4975cda85f..98ed9e60e983377f4748aa78830ccdcfebf5e669 100644 (file)
--- a/package/kernel/mac80211/patches/mwl/950-mwifiex-Print-stringified-name-of-command-in-error-l.patch
+++ b/package/kernel/mac80211/patches/mwl/950-mwifiex-Print-stringified-name-of-command-in-error-l.patch
@@ -19,7 +19,7 @@ Signed-off-by: Pali Rohár <pali@kernel.org>
 
 --- a/drivers/net/wireless/marvell/mwifiex/cmdevt.c
 +++ b/drivers/net/wireless/marvell/mwifiex/cmdevt.c
-@@ -28,6 +28,85 @@
+@@ -16,6 +16,85 @@
  
  static void mwifiex_cancel_pending_ioctl(struct mwifiex_adapter *adapter);
  
@@ -105,7 +105,7 @@ Signed-off-by: Pali Rohár <pali@kernel.org>
  /*
   * This function initializes a command node.
   *
-@@ -205,8 +284,8 @@ static int mwifiex_dnld_cmd_to_fw(struct
+@@ -193,8 +272,8 @@ static int mwifiex_dnld_cmd_to_fw(struct
            cmd_code != HostCmd_CMD_FUNC_SHUTDOWN &&
            cmd_code != HostCmd_CMD_FUNC_INIT) {
                mwifiex_dbg(adapter, ERROR,
@@ -116,7 +116,7 @@ Signed-off-by: Pali Rohár <pali@kernel.org>
                mwifiex_recycle_cmd_node(adapter, cmd_node);
                queue_work(adapter->workqueue, &adapter->main_work);
                return -1;
-@@ -660,8 +739,8 @@ int mwifiex_send_cmd(struct mwifiex_priv
+@@ -653,8 +732,8 @@ int mwifiex_send_cmd(struct mwifiex_priv
        /* Return error, since the command preparation failed */
        if (ret) {
                mwifiex_dbg(adapter, ERROR,
@@ -127,7 +127,7 @@ Signed-off-by: Pali Rohár <pali@kernel.org>
                mwifiex_insert_cmd_to_free_q(adapter, cmd_node);
                return -1;
        }
-@@ -900,8 +979,9 @@ int mwifiex_process_cmdresp(struct mwifi
+@@ -902,8 +981,9 @@ int mwifiex_process_cmdresp(struct mwifi
        if (adapter->hw_status == MWIFIEX_HW_STATUS_INITIALIZING) {
                if (ret) {
                        mwifiex_dbg(adapter, ERROR,
@@ -139,7 +139,7 @@ Signed-off-by: Pali Rohár <pali@kernel.org>
                        mwifiex_init_fw_complete(adapter);
                        return -1;
                } else if (adapter->last_init_cmd == cmdresp_no)
-@@ -1264,8 +1344,8 @@ mwifiex_process_sleep_confirm_resp(struc
+@@ -1273,8 +1353,8 @@ mwifiex_process_sleep_confirm_resp(struc
  
        if (command != HostCmd_CMD_802_11_PS_MODE_ENH) {
                mwifiex_dbg(adapter, ERROR,
@@ -152,7 +152,7 @@ Signed-off-by: Pali Rohár <pali@kernel.org>
  
 --- a/drivers/net/wireless/marvell/mwifiex/main.h
 +++ b/drivers/net/wireless/marvell/mwifiex/main.h
-@@ -1108,6 +1108,8 @@ void mwifiex_cancel_all_pending_cmd(stru
+@@ -1099,6 +1099,8 @@ void mwifiex_cancel_all_pending_cmd(stru
  void mwifiex_cancel_pending_scan_cmd(struct mwifiex_adapter *adapter);
  void mwifiex_cancel_scan(struct mwifiex_adapter *adapter);
  
@@ -163,7 +163,7 @@ Signed-off-by: Pali Rohár <pali@kernel.org>
  
 --- a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
 +++ b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
-@@ -48,8 +48,9 @@ mwifiex_process_cmdresp_error(struct mwi
+@@ -36,8 +36,9 @@ mwifiex_process_cmdresp_error(struct mwi
        struct host_cmd_ds_802_11_ps_mode_enh *pm;
  
        mwifiex_dbg(adapter, ERROR,
@@ -177,7 +177,7 @@ Signed-off-by: Pali Rohár <pali@kernel.org>
                adapter->cmd_wait_q.status = -1;
 --- a/drivers/net/wireless/marvell/mwifiex/uap_cmd.c
 +++ b/drivers/net/wireless/marvell/mwifiex/uap_cmd.c
-@@ -806,7 +806,8 @@ int mwifiex_uap_prepare_cmd(struct mwifi
+@@ -794,7 +794,8 @@ int mwifiex_uap_prepare_cmd(struct mwifi
                break;
        default:
                mwifiex_dbg(priv->adapter, ERROR,