Date: Fri, 3 Jun 2022 17:19:24 GMT From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 91e025689e4f - stable/13 - iwlwifi: import two fixes from linux v5.18-rc7 Message-ID: <202206031719.253HJOS8065728@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=91e025689e4f9489de7071d0c780dfedf7016a26 commit 91e025689e4f9489de7071d0c780dfedf7016a26 Author: Bjoern A. Zeeb <bz@FreeBSD.org> AuthorDate: 2022-05-16 18:07:36 +0000 Commit: Bjoern A. Zeeb <bz@FreeBSD.org> CommitDate: 2022-06-03 16:56:33 +0000 iwlwifi: import two fixes from linux v5.18-rc7 Import two changes from torvalds/linux.git at tag: v5.18-rc7: b20bdd9cc9740ac1f2138adab25ddd51245c67be iwlwifi: mvm: Don't fail if PPAG isn't supported 7635a1ad8d92dcc8247b53f949e37795154b5b6f iwlwifi: iwl-dbg: Use del_timer_sync() before freeing Sponsored by: The FreeBSD Foundation (cherry picked from commit 88a15f72cf6b4e80688daf56a7ac493999f25ccd) --- sys/contrib/dev/iwlwifi/iwl-dbg-tlv.c | 2 +- sys/contrib/dev/iwlwifi/mvm/fw.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/contrib/dev/iwlwifi/iwl-dbg-tlv.c b/sys/contrib/dev/iwlwifi/iwl-dbg-tlv.c index 866a33f49915..3237d4b528b5 100644 --- a/sys/contrib/dev/iwlwifi/iwl-dbg-tlv.c +++ b/sys/contrib/dev/iwlwifi/iwl-dbg-tlv.c @@ -371,7 +371,7 @@ void iwl_dbg_tlv_del_timers(struct iwl_trans *trans) struct iwl_dbg_tlv_timer_node *node, *tmp; list_for_each_entry_safe(node, tmp, timer_list, list) { - del_timer(&node->timer); + del_timer_sync(&node->timer); list_del(&node->list); kfree(node); } diff --git a/sys/contrib/dev/iwlwifi/mvm/fw.c b/sys/contrib/dev/iwlwifi/mvm/fw.c index 747d03471f0d..766bd7c7f9cf 100644 --- a/sys/contrib/dev/iwlwifi/mvm/fw.c +++ b/sys/contrib/dev/iwlwifi/mvm/fw.c @@ -1015,8 +1015,9 @@ int iwl_mvm_ppag_send_cmd(struct iwl_mvm *mvm) int ret, cmd_size; ret = iwl_read_ppag_table(&mvm->fwrt, &cmd, &cmd_size); + /* Not supporting PPAG table is a valid scenario */ if(ret < 0) - return ret; + return 0; IWL_DEBUG_RADIO(mvm, "Sending PER_PLATFORM_ANT_GAIN_CMD\n"); ret = iwl_mvm_send_cmd_pdu(mvm, WIDE_ID(PHY_OPS_GROUP,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202206031719.253HJOS8065728>