From nobody Tue May 19 00:43:38 2026 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 4gKGBL6lxxz6d7h7 for ; Tue, 19 May 2026 00:43:38 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gKGBL56Xdz4DPB for ; Tue, 19 May 2026 00:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779151418; 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=lQeqeq7vjunFF4gh+A/pvc39Ag/NO/6VLd4hf9qrncw=; b=TeN+9cbMugOkorOA/TYSIHp2KjVpEKYNLIrU6KzF0RsTSqPuzKlzhYqrEPTjIsJjgrTtDx cyHrX5iYqPv9YupnNW6DR0J5o8pZApPK12u3NC/rXCrcWFs3iuowCMNI6WvK/CCNru7/Sj kbZzCsQ/hzhFQoM8MloCAwS+6JKgYUjAye6O2L5PD848A19Qt/OPIVdvE/qLPYtfc80zST G6CI7ThD/xBmy1j4vpZIXceLWm52zc2iJf/DZWBftaSSVr3WE4G3uP2uaQZjMxdBwmJ25f L3/XWPgb6GC5KT5T8klTb4/MKnHPa18o6I/RtrebI5YChZD4vszcEc/gcyzsJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779151418; a=rsa-sha256; cv=none; b=rgk3atjDeAK2ROF5NDqcyZgt9Fb27THtl+W/mxl3tgCyIk+8v0KuSHX9/uTUIptsVx17PZ f/2x5vlT9Vi9QdmLglV3v8n1p2NixXUFc8wN841bTEkEIriqGP1tfII3jLHT4ADpNm2J6J OceRo8tfYOrQelCycjwMzsLFffECMSCQIWxaHMA/RVoJNOM3CJzMR2+/oIC/OFmn5qv09j QCJq8tkXiwt5CGtsnoq2DZA2NZlT7PIjVrNKpf34kxiFByMMfUehrJw4sURGiFmy1P1HJg TxlXvFxP9kmS3aiLaF0sD3j2vRVi3qamWxbKexhcm/rd4e5n/5Rh/48NQPHSaQ== 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=1779151418; 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=lQeqeq7vjunFF4gh+A/pvc39Ag/NO/6VLd4hf9qrncw=; b=peLOCCsHIz4VlS0+FHQXjT1UKdtZi6cLNOdHzrY+FdM5dphdaXIuTV17OhLtixoAOUMT9G /CQPswhKZlxgDEHe0sUm7Z6aOnR5Bgs2b/jwzCMW6ejQE4hLyvsbMQKS7hRF1TRAVecLxI AfSS0B0mIyyMjbAAPM4pjH0X+97Q/w9Orz/5bhk8rHLlRRfXJ8Q54xATCyMP2dkeQX2vff agnYE9CLy7L768hNv1PaW6V0PplJGVDfn61HLwCgzi1CsQYmQ6X/hvQaR2xBaSzUotIjAa fCJf4D8xgaeZdfvTf8toBS9rDvJDUy+esNGaS7Hjhl80EiTUl/XKzWvQb7KvyA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gKGBL3XfwzrjH for ; Tue, 19 May 2026 00:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26aa1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 19 May 2026 00:43:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 7e74f27a5af8 - stable/15 - wtap: use typed rssi and noise floor values 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/15 X-Git-Reftype: branch X-Git-Commit: 7e74f27a5af86c0e2ff23f8ca52a226b8907865c Auto-Submitted: auto-generated Date: Tue, 19 May 2026 00:43:38 +0000 Message-Id: <6a0bb23a.26aa1.3b95cf72@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=7e74f27a5af86c0e2ff23f8ca52a226b8907865c commit 7e74f27a5af86c0e2ff23f8ca52a226b8907865c Author: Bjoern A. Zeeb AuthorDate: 2026-05-13 21:14:39 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-05-19 00:43:15 +0000 wtap: use typed rssi and noise floor values Adjust the rssi and nf arguments to typed int8_t and adjust the maths for rssi to be consistant with what net80211 expects. Sponsored by: The FreeBSD Foundation Reviewed by: lwhsu, adrian Differential Revision: https://reviews.freebsd.org/D57020 (cherry picked from commit d201e4e8491901d1de6bcaeb581a0bf958bf86f2) --- sys/dev/wtap/if_wtap.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/sys/dev/wtap/if_wtap.c b/sys/dev/wtap/if_wtap.c index dd332c538c8f..376b63e38f2b 100644 --- a/sys/dev/wtap/if_wtap.c +++ b/sys/dev/wtap/if_wtap.c @@ -495,6 +495,7 @@ wtap_rx_proc(void *arg, int npending) struct mbuf *m; struct ieee80211_node *ni; struct wtap_buf *bf; + int8_t rssi, nf; #if 0 DWTAP_PRINTF("%s\n", __func__); @@ -528,6 +529,15 @@ wtap_rx_proc(void *arg, int npending) ieee80211_dump_pkt(ic, mtod(m, caddr_t), 0,0,0); #endif + /* + * Use arbitrary but sane values, and do the correct conversion + * for net80211 using 0.5 dBm values relative to the noise floor. + */ + nf = -95; + rssi = 42; + rssi -= nf; + rssi *= 2; + /* * Locate the node for sender, track state, and then * pass the (referenced) node up to the 802.11 layer @@ -540,10 +550,10 @@ wtap_rx_proc(void *arg, int npending) /* * Sending station is known, dispatch directly. */ - ieee80211_input(ni, m, 1<<7, 10); + ieee80211_input(ni, m, rssi, nf); ieee80211_free_node(ni); } else { - ieee80211_input_all(ic, m, 1<<7, 10); + ieee80211_input_all(ic, m, rssi, nf); } /* The mbufs are freed by the Net80211 stack */