From nobody Tue Sep 2 11:06:59 2025 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 4cGNH85Gbpz66WWy; Tue, 02 Sep 2025 11:07:00 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cGNH83Y9Fz3LLc; Tue, 02 Sep 2025 11:07:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756811220; 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=wTDXbs5Ef4PMKqk6bBzWzRTaC4rRU6txTMIkTRv/irM=; b=tdY2oHoHVeSnXq6hvbTKhvEUwZMHxfOo/XR4w2rwGr1pySozg3FsmrRnuE5PyBqDdtUF06 2mN8krxSUHqcmdoFMk2rlXe+G6lay9NBV6f2rBkSsirXeex0ODRuPH+lzK0DGHROAFW7Cv mdhmaR73PCnH+OqI3wmuYc8sBNTqGRVspkL+fhdMbsoo447cRK00i2UMdswPfKAT3+zqMo NSu+o60ApgIomt+HGZ/onbq1Ny1Mml4qOF8tK0L00zat2fm5mO974o51v/h3uvcS2vKTUq p4pGl3F4TUGOHc+cx1cqR7hEFoNPXuFGnlEh8HXRf/YgNsmAWZ3UPQuPIJbhxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756811220; 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=wTDXbs5Ef4PMKqk6bBzWzRTaC4rRU6txTMIkTRv/irM=; b=pzOu1RWTib4r3UoqsoWQKWHywiHlcfNESRrspDgnkkRWTxeIyVMYYqH1nxqpPQZr78fHaZ HjlXk8EKMPzHYDSG7lwKMNAnl13CNVoVtfSwiXby0DmtUJs0WJa0tuzVbTj9z5FEUKM9df zxdOj16TuOxlhuCrxS5XrUF+eMIJPd8xEZCIaDUIeUWoOdrx37lgxCkhcIl3YLWYwbjz94 hS4VAzep9Z5HtHSi/nmoKhhG4A9F1BWlznMJvxL9etsdVwTUXeNWx4YhDNR+yjVeVS8zZn c5NZAyf2K8MR4j2Nl4pdIsPN7TAk5gI43z3QN94YvV3m48BFSy+jDONVK4kBUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756811220; a=rsa-sha256; cv=none; b=Lrgm++pvdVAz8llld52IFkipxezctqsMKvyB/MNL1aas+QTPn6NYLAA3t7G8IDhQrg5HM8 TA8lM1SPAGdQfF7XHO1GkYH6D2GTCzz/BeC3IGMtWMArxSY58XX3xsNJZYF4+p+0Xgb7CE GtAUP+Sz/t2AX1KEcwZBRQjSy5YZ0F7yevdloySJVer1TK7iOTTIBqPJYifwBuM4vwmu91 bLPByztdlpf4YyziWjMEFXhM5O6dv3hE9D/BpEJa7ZJ7YNAnackmEWC0mxplpuEvaUEALO PSV5A2aEP5lVVEhMWAZUirIJPqhQmmf7+ejCqbbuP1NVhiOxL5uAIeMdWrZWQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cGNH80PJHzkcp; Tue, 02 Sep 2025 11:07:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 582B6xAc085737; Tue, 2 Sep 2025 11:06:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 582B6xbS085734; Tue, 2 Sep 2025 11:06:59 GMT (envelope-from git) Date: Tue, 2 Sep 2025 11:06:59 GMT Message-Id: <202509021106.582B6xbS085734@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: 00c9ebbbc653 - main - LinuxKPI: 802.11: counting beacons for debug only when assoc 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 00c9ebbbc6533bd0b23e374a59e91345bb26d3dc Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=00c9ebbbc6533bd0b23e374a59e91345bb26d3dc commit 00c9ebbbc6533bd0b23e374a59e91345bb26d3dc Author: Bjoern A. Zeeb AuthorDate: 2025-09-02 08:20:11 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-09-02 11:04:29 +0000 LinuxKPI: 802.11: counting beacons for debug only when assoc Simplify the logic and only count beacons when we are assoc, given we only do this for debugging purposes of beacon/connection loss. Fixes: bdfe17f129db0 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 6c838df28ff6..f0881773726f 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -3828,6 +3828,7 @@ lkpi_iv_sta_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0, enum ieee80211_bss_changed bss_changed; lvif = VAP_TO_LVIF(ni->ni_vap); + vif = LVIF_TO_VIF(lvif); lvif->iv_recv_mgmt(ni, m0, subtype, rxs, rssi, nf); @@ -3835,13 +3836,18 @@ lkpi_iv_sta_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0, case IEEE80211_FC0_SUBTYPE_PROBE_RESP: break; case IEEE80211_FC0_SUBTYPE_BEACON: - lvif->beacons++; + /* + * Only count beacons when assoc. SCAN has its own logging. + * This is for connection/beacon loss/session protection almost + * over debugging when trying to get into a stable RUN state. + */ + if (vif->cfg.assoc) + lvif->beacons++; break; default: return; } - vif = LVIF_TO_VIF(lvif); lhw = ni->ni_ic->ic_softc; hw = LHW_TO_HW(lhw);