From nobody Thu Oct 05 14:33:32 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 4S1Yvc3nDRz4ws4w; Thu, 5 Oct 2023 14:33:32 +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 4S1Yvc30qnz4Qtg; Thu, 5 Oct 2023 14:33:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696516412; 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=rWHApdaTTBwyFz4C4bbSd23acU79KtDpiYRAJ2JbhXk=; b=G4PZ1Yxhe44Et8jsKjh46nmvQcYyAS3GKpf/8ZGPR9TbHxBz0by9td3iO3pNBMGak8ONVH DjV1XYpdIDn6BLl+/CwIVXkw4pKzfFMhm0DIHFaMCHCR5C6OwTjYxBoFfHZ483vjynmXZG RIA32NuAxuXpAz/Ur0Se2jbrg/pGolwDuXzi/Lag57/ZrdBeybxaVZtovtSfWD1EigCL8D FdirYdKiOQ4kYtqdpb/wtKISZZ2tdcwXR/JGAjCWrtMJIVWJtNTM9zkA6Gf1NyliNuWEpC ns/vQPPSMo8UIvsI8/5Z7p1I3BK7Lke1UL5rA7cSgf+wLWE3xalGgbk63upQRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696516412; a=rsa-sha256; cv=none; b=jrFL3G1yQm6fC0yT7iW6NQzrlBA5aCBcU/xpahQAUCG1KOTNWlZevlmD2aFLkVpRqlL5hz Fc03b4UklbhtGU42c+QKcpwOWarZkOw3bVx/w7ZMXH6P8gg7q6v1GALK4nBbGOHbJWDW55 WOITx9rxladSy0GxcLvwy1wk4exoeZa0NdTnb0rF9e9Ff09ENL6I7NzoaMsaq91qIeUCDB ZJEY5mEsnQD7rIEwu7Zad2JbXFsU0/xBWnyzoaNTsGFx8w0JmQz9vaZAbaQLF9thcgg39p WAxj/g95cQokl/yqiVxZJPuqbPIujgKDQIk9fF5PZn66ILMwlhomKgE64ZcHpg== 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=1696516412; 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=rWHApdaTTBwyFz4C4bbSd23acU79KtDpiYRAJ2JbhXk=; b=oruiFn1cw5aS0Uw+DltO3j4duLEqO6PXq9OxyEOENs1tQXOO+cgw9BtWlxLge1WRr8PiTE VEldfAd/td8R87cmtjBSC43crnBISXEVynDvfekBDvWQ/ywEDV5oPf4BRGRNRoDM4K32zb SSSQhXRcqPva7sJvzvhr9orZ/5C0YHHUeFtHekPjZWa2KBulas4aaujtkmb/ZPqB3jDpQw ZSIC7oi6j/oLhRup1fEiWeRVa+l9pTYqf5K0zrhIw7s87513qvv83L9IefJ2JMOR8ljk+I wuUYF+bxuNgb7QKUC+rTRWIZQheKnT7oGrxSJJPm8poAiLysfWl3Y1yOD+zasA== 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 4S1Yvc25wHz1NVt; Thu, 5 Oct 2023 14:33:32 +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 395EXWkd010765; Thu, 5 Oct 2023 14:33:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 395EXWGE010762; Thu, 5 Oct 2023 14:33:32 GMT (envelope-from git) Date: Thu, 5 Oct 2023 14:33:32 GMT Message-Id: <202310051433.395EXWGE010762@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: 0d2cb6a6ecde - main - 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/main X-Git-Reftype: branch X-Git-Commit: 0d2cb6a6ecde3b271ede59d77801cb43a8804688 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0d2cb6a6ecde3b271ede59d77801cb43a8804688 commit 0d2cb6a6ecde3b271ede59d77801cb43a8804688 Author: Bjoern A. Zeeb AuthorDate: 2023-10-04 20:30:00 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-10-05 14:32:41 +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 MFC after: 3 days --- 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 9f5f5bef7f27..4a296e2f0fad 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);