diff options
| author | Johannes Berg <[email protected]> | 2024-02-08 08:57:43 +0000 |
|---|---|---|
| committer | Johannes Berg <[email protected]> | 2024-02-08 08:58:25 +0000 |
| commit | af4acac7caa17cf10742c80e2dd859e21d06abb9 (patch) | |
| tree | 650468891990d2f8edc6726aab697ff35d8b9673 /drivers/net/wireless/intel/iwlwifi/fw/api/debug.h | |
| parent | wifi: rtl8xxxu: update rate mask per sta (diff) | |
| parent | wifi: mt76: mt7996: fix fortify warning (diff) | |
| download | kernel-af4acac7caa17cf10742c80e2dd859e21d06abb9.tar.gz kernel-af4acac7caa17cf10742c80e2dd859e21d06abb9.zip | |
Merge wireless into wireless-next
There are some changes coming to wireless-next that will
otherwise cause conflicts, pull wireless in first to be
able to resolve that when applying the individual changes
rather than having to do merge resolution later.
Signed-off-by: Johannes Berg <[email protected]>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/fw/api/debug.h')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/fw/api/debug.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/debug.h b/drivers/net/wireless/intel/iwlwifi/fw/api/debug.h index a4b54488e0fc..b31ae6889bd0 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/api/debug.h +++ b/drivers/net/wireless/intel/iwlwifi/fw/api/debug.h @@ -537,7 +537,7 @@ enum iwl_fw_dbg_config_cmd_type { }; /* LDBG_CFG_CMD_TYPE_API_E_VER_1 */ /* this token disables debug asserts in the firmware */ -#define IWL_FW_DBG_CONFIG_TOKEN 0x00011301 +#define IWL_FW_DBG_CONFIG_TOKEN 0x00010001 /** * struct iwl_fw_dbg_config_cmd - configure FW debug |