From nobody Wed Nov 29 16:38:44 2023 X-Original-To: dev-commits-src-all@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 4SgQ4h44Llz52x5f; Wed, 29 Nov 2023 16:38:44 +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 4SgQ4h2jh6z3KTd; Wed, 29 Nov 2023 16:38:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275924; 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=xnzpMC1QOXEz+v7BmVxPoDpFr3H6szkTdUL2IGXvwX4=; b=LH0ztqvHegZvc1Ennft517IUUKA7Pv2KFuLEmR4kJo6qXLaN7UXj8VzzVL+N5UdQKlSbbG NEvxU4nzH0T9uvksGIumStl/l5gTAg2v9EDilaA4suGc7OIuvWiW3tojoX43qzIAEtequ2 WAstmIB1KnD3w35DpyPVTRioQYq6HoU7EBWCIl3MEb16DIdHJbyQiM2wR2GAn3JQlbAMO/ TirXjrU4MiGWgBC55z/OLmOts7Y24EhrXMZgMa3V/bvaHMAaBlpsk93ba5i4Tpf9lfaq5S qwyUaczf1P95UvawmEevH+v5Kkx1IffNUhd1saI4lhqJ/6d/SnqKaqFaIZwNkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275924; 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=xnzpMC1QOXEz+v7BmVxPoDpFr3H6szkTdUL2IGXvwX4=; b=GSnvckFJor3TfiRjY6eoiwk83alwxA0w7fPAgCdEtOYfa38ldI7GgflmTEusU08Ge0cgnU MhvZR435SroaIQH6nO6nYp6eZ8AzodPNvoEuyxu0uxMlfxMAjATt5xP3zmcJsPPkRmMprf SFp5jDn8tnz2Agcgxly++7eb+n3zbdH4vgFF3NBwEAbAhx5O65U9uHX1SqkOQBdHDh1S4f rKboyXJA/KLiPlaniJbLLzwp2GsnRbkeWg8fGmt4Edyl9lfaGVl+Ma+5J2n19Myi0mazFr XMBjsry4+XsqJj8wvN4JEnbGeU+4PS3QbKtahWZISihgTsg6aDYQeiegijWGtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275924; a=rsa-sha256; cv=none; b=NHmEqFTJZZY8uHj49GHB0RcAl7z0Ltaaof71pstK7TFlNl0ow2Xm6BnoYq2A7esnOCZ3+H PqtVWNYxeL0jTfjkiXK9inR3RxFV7cRR2Ezc5TAZpwQEvw3HN2UQJ6Je+YwmG2GcEJ3cj3 QRWHjskmYRsdUpw9M728dwIdYN49F76HMEPb6QPRCaNog8wrdF+0BDAByGYx3JswsSa6Dh 9a/30JDQlzwjBuTJ5tA1xXf8QdnokU2zlnjidYpgzEz8IxQDIDxLXTDx3z6nmdrN1nafxG jg/lOuOL+huQZxT9alEcIsEGG/M8D7Q7YWt4/4ORDjn/Bx3g/CAuJCgZmSUHcw== 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 4SgQ4h1qc7z1C7b; Wed, 29 Nov 2023 16:38:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ATGciXW046654; Wed, 29 Nov 2023 16:38:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcinu046651; Wed, 29 Nov 2023 16:38:44 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:44 GMT Message-Id: <202311291638.3ATGcinu046651@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: 60e471befc83 - stable/13 - LinuxKPI: 802.11: hide txq debugging behind checks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 60e471befc83a5e2203b1d45326a5d9ac7ff91d5 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=60e471befc83a5e2203b1d45326a5d9ac7ff91d5 commit 60e471befc83a5e2203b1d45326a5d9ac7ff91d5 Author: Bjoern A. Zeeb AuthorDate: 2023-10-04 20:30:00 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:10 +0000 LinuxKPI: 802.11: hide txq debugging behind checks Two txq debug messages were left unconditionally. Hide them behind ifdef/if() condition checks for selective debugging only. Sponsored by: The FreeBSD Foundation (cherry picked from commit 0d2cb6a6ecde3b271ede59d77801cb43a8804688) --- sys/compat/linuxkpi/common/src/linux_80211.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 0a673a313c1e..b3aec1e712bd 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -4911,15 +4911,18 @@ linuxkpi_ieee80211_stop_queue(struct ieee80211_hw *hw, int qnum) for (ac = 0; ac < ac_count; ac++) { IMPROVE_TXQ("LOCKING"); if (qnum == vif->hw_queue[ac]) { +#ifdef LINUXKPI_DEBUG_80211 /* * For now log this to better understand * how this is supposed to work. */ - if (lvif->hw_queue_stopped[ac]) + if (lvif->hw_queue_stopped[ac] && + (linuxkpi_debug_80211 & D80211_IMPROVE_TXQ) != 0) ic_printf(lhw->ic, "%s:%d: lhw %p hw %p " "lvif %p vif %p ac %d qnum %d already " "stopped\n", __func__, __LINE__, lhw, hw, lvif, vif, ac, qnum); +#endif lvif->hw_queue_stopped[ac] = true; } } @@ -4966,15 +4969,18 @@ lkpi_ieee80211_wake_queues(struct ieee80211_hw *hw, int hwq) /* XXX-BZ what about software scan? */ +#ifdef LINUXKPI_DEBUG_80211 /* * For now log this to better understand * how this is supposed to work. */ - if (!lvif->hw_queue_stopped[ac]) + if (!lvif->hw_queue_stopped[ac] && + (linuxkpi_debug_80211 & D80211_IMPROVE_TXQ) != 0) ic_printf(lhw->ic, "%s:%d: lhw %p hw %p " "lvif %p vif %p ac %d hw_q not stopped\n", __func__, __LINE__, lhw, hw, lvif, vif, ac); +#endif lvif->hw_queue_stopped[ac] = false; LKPI_80211_LVIF_LOCK(lvif);