From nobody Mon Oct 9 23:16:23 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 4S4FK334fpz4wgln; Mon, 9 Oct 2023 23:16:23 +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 4S4FK328hxz3Qfq; Mon, 9 Oct 2023 23:16:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696893383; 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=i5PB59bVKR+aXS5KREMosq5Ay/gKA1SUmJt+68ibWHE=; b=qhERs4Yy/tavDeM3nvSip/hBNkNmjlFL8jzNz8fhHtlv278gLCBRMNcnXdt9ZYAf0R6Ew0 Ee9oT5DBiKkQrMCBvLMl/rPzcxfyu/M5yuXzKpLD/y+t+Z6x5KrcK/8Kbu5eZXClewSROw eYcK5lOgI8XUO88jaDsXqj1QYd3Nwc42noOWyRwpXmRUbi2h+vEDFPKVsAUlqT1WDo5sCB 8/2Xt0CX0DtHnYfKrPbNpvMLzi2QR8yu9Ejqe31zKwKxRB6nj/BVO4YgtgK12Fyit0lhrS eHkoE60gf80OQPCiaLiSZytyoroXh88AmVGEKWp+EjWdC/kRo+JAmQOb61V42Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696893383; a=rsa-sha256; cv=none; b=El3ZmLsvjaMB8K5Zmdva3RcUFAf+8nx+ARDwzgsO92PvScIGH2BqtI3N7BEbnQEH/XhPAp /2KCh7h14m/r3OsmmctlkCz9pVYMrNYzR82UlVawucUfTj0sgrZKFnYT9EumRlxQW4gO3h 56J4usd5t5Z1Wo6h4eUnTsaIdElSEIkOqZYU6rNQmeVk0uThgm/oP20D57tDeOe5B5wFNz bRzaH1HpddTJscQhmFxi2enuBsW3tW+E/qlwGdyOb8e8x9u3kvGb0YQ8Mu/20QbJZGzJBa wSyv/QS3AkJYIW8MNUiIqzbiSezWlAsy/yD99NHRy5Zoh7r2Vq2EBfq5Z9NCQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696893383; 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=i5PB59bVKR+aXS5KREMosq5Ay/gKA1SUmJt+68ibWHE=; b=qrodGDdzj9uYW2Yd7ACrEQ7+zIEFqGB6mqkQHU4d/I3XsT8HxbtSCergBLr90c/cd4gBeh Yv2JQMH1/9KV+XD92KLC38vAQkNjO8mtzWufIRvkmWdubYuA3bi35k3Ae9Tg6Tl8PfomC5 FcgdnJF4OvqtlPTbv3NDtsg33oEbwNQZjam1+FnZL8OJzcIVlbHlMAsho+bCERSUsonQae iMarOCFmkbrYzpLsmIZoGfjmEMqNZ1TUEwyI+b260xKgrlerjCMEZ/eiRY5xB7POTDyZe2 FPpiIeeqamjYYqDPdF1juvBFUutrbQN8Qznv6YtXvI5WUFM+63RAwVL2Qzpy4g== 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 4S4FK31Ct1z11H; Mon, 9 Oct 2023 23:16:23 +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 399NGNB1071632; Mon, 9 Oct 2023 23:16:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 399NGNwh071629; Mon, 9 Oct 2023 23:16:23 GMT (envelope-from git) Date: Mon, 9 Oct 2023 23:16:23 GMT Message-Id: <202310092316.399NGNwh071629@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: dae4e5ad140f - releng/14.0 - 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: dae4e5ad140f1e7671cb22a9640c1395c5688f00 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=dae4e5ad140f1e7671cb22a9640c1395c5688f00 commit dae4e5ad140f1e7671cb22a9640c1395c5688f00 Author: Bjoern A. Zeeb AuthorDate: 2023-10-04 20:30:00 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-10-09 23:14:54 +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 Approved by: re (gjb) (cherry picked from commit 0d2cb6a6ecde3b271ede59d77801cb43a8804688) (cherry picked from commit 5b9404565fef6cf4f01210343c8074b9407cb268) --- 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 b3ee07a9bab9..7ffe658a628d 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -4831,15 +4831,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; } } @@ -4886,15 +4889,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);