| Message ID | 20241029093926.13750-3-johannes@sipsolutions.net (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c05c62850a8f035a267151dd86ea3daf887e28b8 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | pull-request: wireless-2024-10-29 | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Pull request for net |
| netdev/build_32bit | success | Errors and warnings before: 5 this patch: 5 |
| netdev/build_tools | success | No tools touched, skip |
| netdev/build_clang | success | Errors and warnings before: 3 this patch: 3 |
| netdev/verify_signedoff | success | Signed-off-by tag matches author and committer |
| netdev/verify_fixes | success | Fixes tag looks correct |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 4 this patch: 4 |
| netdev/build_clang_rust | success | No Rust files in patch. Skipping build |
| netdev/kdoc | success | Errors and warnings before: 20 this patch: 20 |
| netdev/contest | success | net-next-2024-10-29--15-00 (tests: 776) |
Hello: This pull request was applied to netdev/net.git (main) by Jakub Kicinski <kuba@kernel.org>: On Tue, 29 Oct 2024 10:06:23 +0100 you wrote: > Hi, > > A couple of important bugs were found, notably an infinite > loop in iwlwifi but also other bugs, which is why we have > a new pull request so soon. > > > [...] Here is the summary with links: - pull-request: wireless-2024-10-29 https://git.kernel.org/netdev/net/c/c05c62850a8f You are awesome, thank you!
Hi, A couple of important bugs were found, notably an infinite loop in iwlwifi but also other bugs, which is why we have a new pull request so soon. Note that this unfortunately introduces two merge conflicts with the previous wireless-next pull request. I'm guessing they will land together in net-next after wireless-next is pulled, and then net goes into net-next. The first conflict is in net/mac80211/cfg.c, and is just two new lines in the same place: @@@ -3070,7 -3046,7 +3070,8 @@@ static int ieee80211_set_tx_power(struc enum nl80211_tx_power_setting txp_type = type; bool update_txp_type = false; bool has_monitor = false; + int user_power_level; + int old_power = local->user_power_level; The other conflict in drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c looks more complicated, but really isn't all that much, just take the -next version. Which I think really means I incorrectly did the iwlwifi changes in 188a1bf894323b ("wifi: mac80211: re-order assigning channel in activate links") because that never claimed to move the iwl_mvm_link_changed() vs. iwl_mvm_send_ap_tx_power_constraint_cmd() calls ... Please pull and let us know if there's any (other) problem. Thanks, johannes The following changes since commit e31a8219fbfcf9dc65ba1e1c10cade12b6754e00: Merge tag 'wireless-2024-10-21' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless (2024-10-25 10:44:41 +0100) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git tags/wireless-2024-10-29 for you to fetch changes up to cf44e745048df2c935cb37de16e0ca476003a3b1: wifi: mac80211: ieee80211_i: Fix memory corruption bug in struct ieee80211_chanctx (2024-10-26 00:42:49 +0200) ---------------------------------------------------------------- wireless fixes for v6.12-rc6 Another set of fixes, mostly iwlwifi: * fix infinite loop in 6 GHz scan if more than 255 colocated APs were reported * revert removal of retry loops for now to work around issues with firmware initialization on some devices/platforms * fix SAR table issues with some BIOSes * fix race in suspend/debug collection * fix memory leak in fw recovery * fix link ID leak in AP mode for older devices * fix sending TX power constraints * fix link handling in FW restart And also the stack: * fix setting TX power from userspace with the new chanctx emulation code for old-style drivers * fix a memory corruption bug due to structure embedding * fix CQM configuration double-free when moving between net namespaces ---------------------------------------------------------------- Anjaneyulu (1): wifi: iwlwifi: mvm: SAR table alignment Ben Greear (1): mac80211: fix user-power when emulating chanctx Daniel Gabay (2): wifi: iwlwifi: mvm: Use the sync timepoint API in suspend wifi: iwlwifi: mvm: Fix response handling in iwl_mvm_send_recovery_cmd() Emmanuel Grumbach (3): wifi: iwlwifi: mvm: don't leak a link on AP removal wifi: iwlwifi: mvm: don't add default link in fw restart flow Revert "wifi: iwlwifi: remove retry loops in start" Gustavo A. R. Silva (1): wifi: mac80211: ieee80211_i: Fix memory corruption bug in struct ieee80211_chanctx Johannes Berg (2): wifi: cfg80211: clear wdev->cqm_config pointer on free wifi: iwlwifi: mvm: fix 6 GHz scan construction Miri Korenblit (1): wifi: iwlwifi: mvm: really send iwl_txpower_constraints_cmd drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 96 +++++++++++++--------- drivers/net/wireless/intel/iwlwifi/fw/init.c | 4 +- drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 34 +++++--- drivers/net/wireless/intel/iwlwifi/iwl-drv.h | 3 + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 2 + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 10 +-- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 12 ++- .../net/wireless/intel/iwlwifi/mvm/mld-mac80211.c | 34 +++++--- drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 6 +- net/mac80211/ieee80211_i.h | 5 +- net/mac80211/main.c | 2 + net/wireless/core.c | 1 + 12 files changed, 134 insertions(+), 75 deletions(-)