From nobody Fri Jun 03 17:19:24 2022 X-Original-To: dev-commits-src-branches@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 A4E171BDA7ED; Fri, 3 Jun 2022 17:19:26 +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 4LF8kk0jZ0z4XQp; Fri, 3 Jun 2022 17:19:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654276766; 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=u4zRFUYnaAtKq8+Ndb9HI/cj6N6nxiRZQN4rBovvh68=; b=dt5t7Iabu7HL9F4dMg5O4DITcNhGZUFWGPBgjF2wQIDoNb0cLPv6lHj7uEdNRtjV65SLNE cz3Z2l8Csb3uJJcaAnsuQyWbVVqsoYqG/GEUBUI6JZBy8znclA24xsrxs7mlmnsDjFDI8n 7bcgk+cyvxw/M2aHPeX/DkZdXlXx8hN8uPp6BNy7L/FHb9vcFmWc6vPJVXeMGnDBXKczs+ B6e+CmLeFLoQmMXhkRkCW9HoTmtK/s5Qm4bQe+E0VeKyMHkPfHkMiw129z+QYXB92B2ee5 bwJZ+q8D86rQRE5CEmsxshdtUTrrbVbq49vuDfZgj4cgJ8lhXHq9vU2VL4wxsQ== 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 33360513F; Fri, 3 Jun 2022 17:19:25 +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 253HJOx6065729; Fri, 3 Jun 2022 17:19:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 253HJOS8065728; Fri, 3 Jun 2022 17:19:24 GMT (envelope-from git) Date: Fri, 3 Jun 2022 17:19:24 GMT Message-Id: <202206031719.253HJOS8065728@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 91e025689e4f - stable/13 - iwlwifi: import two fixes from linux v5.18-rc7 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 91e025689e4f9489de7071d0c780dfedf7016a26 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654276766; 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=u4zRFUYnaAtKq8+Ndb9HI/cj6N6nxiRZQN4rBovvh68=; b=Mr7FCcE9TQiEtHPyf0jgMb2VZ2RTz1ahv+M1+a86RoEFl4LvZD3GAgj1KE2k2dBnwNTCpL 4SIOb/0jK+LeCw58g1bX8RnzC8ClHygz5J886BBXpBdcil5DY1EVD7a7+41wj13pObFCSa eoWp/SvQsOTH8YVIwes9+sMY2EYn8Azy3FrjDYZg/3CzekCS0izdz2h5BVDTIXRC6UBXN3 18I3bpyOhh03PzxzNfPKzxSSqBr/EVrN2DBrDtV4BnYYmtJ1Mxre6RdZ6o4vgNTmxVFKJw bve5xAjmrpjD9a8PWZ7iSvfW03Y6PCUxdRl9sYfp7Ej58127UiETRmxDYxi57A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654276766; a=rsa-sha256; cv=none; b=rfDnMXu4/7Yefjl2XkTOdkQc/uMdKxMAnYKLENVkKKEENwTDGec+7p4Nj/WlwrZLTaYuLG jzSO30RwoGxOqhiqzTprKnrFn8yZpBuuGIYygFMrkNES/GGivQrkyA9fvHRusb5Fv9PS1N br6/ttYTaf62qfAujnr+un19WyG5bmws4Y7GX5Wz435KT8PzNsmBF/uo/NYMGc+XZbvfEI IY/5dGEhP+Dk1z+jJN5mbQrQATj3w7GWTFJXrs3/xdu9I3QOlaSTPA+x52DIeycvLNf9Oq eQitNVW/u4TNKJN+B9hU8NYulzbLjeQXlfrP/kCqwy2yPs1YtL7VPFQFtqBWTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=91e025689e4f9489de7071d0c780dfedf7016a26 commit 91e025689e4f9489de7071d0c780dfedf7016a26 Author: Bjoern A. Zeeb AuthorDate: 2022-05-16 18:07:36 +0000 Commit: Bjoern A. Zeeb 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,