From nobody Mon May 16 18:12:16 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id B77AE1AE3972; Mon, 16 May 2022 18:12:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L26m100BQz4gSf; Mon, 16 May 2022 18:12:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652724737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ux2C9CfpNWAkr83esa2cVII1p/3YNgd4lkdEQbNhnOE=; b=X3cyEWusDgr8uZbT/19nDDa0QYJDb26sR36mrQjJpWDsaBRxj425i3iMckFYlmDaTeQgEp HNsBYrzetAK0SekbW25M8mc1vlI0Adm8YNDqXBI5vfG71JPKmQC0IY57R0Ei3Qj1OmM04B HzWZ9fSMlcQ7SwYC+N4lA5DaIDuQQJv48e/tw4mAIeOjqO83vj79O0KCYD8W8DnSMZXDjT Svi6oiIOTmJ1S+dXJOwxzP2Os7oS7UQPX6tiUE55z6F+R6DQU8E9+9IRcyRrtBCz9QpGD2 c1NQF/CqrGt7GPowQnF1oAACGea+4n2CK31C+vWhuxhGMY6xZM2fMkQ8peWdMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B46CF247FF; Mon, 16 May 2022 18:12:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24GICGNR036470; Mon, 16 May 2022 18:12:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24GICGac036469; Mon, 16 May 2022 18:12:16 GMT (envelope-from git) Date: Mon, 16 May 2022 18:12:16 GMT Message-Id: <202205161812.24GICGac036469@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 88a15f72cf6b - main - iwlwifi: import two fixes from linux v5.18-rc7 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 88a15f72cf6b4e80688daf56a7ac493999f25ccd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652724737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ux2C9CfpNWAkr83esa2cVII1p/3YNgd4lkdEQbNhnOE=; b=dm5n4TEbfilHhe5u1aSdZQumNLDzDXsYJCo4rhiYFlYkqVtr23fQ3K0Bo7Ttp8E/9ECR2f RW4rPu+ADim/1+BCtHbRqPoDzgTEA1xHLIDYdEp0S74gjwojm++3/DHo/a34/WIcJGuU5B /CJ8LrayvgnX6d0RnpSFYx1QBAO8K4u7kaY/Mk8wyuL8bFXo291SlgafXD2+joy55Js2pe oss8+JsJQG7N13zezCHp7UblVZAj8Xm3zSb6Ax5hKlsJpL1840wcRAA8PgQb97K9jI8Bea IYPUXZjuKskXQiqm9ZdipE6/YWm+aaLsAznfrCtbtxXnPTd+8qhRp4OH8MTo2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652724737; a=rsa-sha256; cv=none; b=GBM89OMGoFxJWohLuTSl8KrarDc2B5fXA/OJnDn9VKiVl7dSn/slSskT1yz+9+vHYnxA/F +nTj/2eOsB11gCj89pNXleMy3LatgqNRdmHGwTLtV0MYs/Wk2TsnvTus3UhBtvW7oiYN/r C91tW8ZBBlUbiU4R/czbqVQxcGR2bA9g/OuOqXeeQBB1G1a9tqP+xduho5lfAJHJYHnwLm jFeMvBg1zX8JHj1SEvB5HdbNd6kY9XeyTY5q6G+hQDOBx+zMVA6R+4p1kLvn7OV8j6egRc 4KUMixm01mif8b9gZemgNybi5AVy3FuiV2CBnv13uaXnaWugl/i3jxDS035HQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=88a15f72cf6b4e80688daf56a7ac493999f25ccd commit 88a15f72cf6b4e80688daf56a7ac493999f25ccd Author: Bjoern A. Zeeb AuthorDate: 2022-05-16 18:07:36 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-05-16 18:07:36 +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 MFC after: 3 days --- 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,