From nobody Fri May 15 21:59:45 2026 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 4gHLhd4cJpz6f33n for ; Fri, 15 May 2026 21:59:45 +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 4gHLhd3m3kz4MWV for ; Fri, 15 May 2026 21:59:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778882385; 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=XdqtFy2ex9sHtPWnZqtLvxLLRKWaS7jhIfvcFfaLc/A=; b=hf+eQguWhbTV5lZK+4CyLVzrgzMe6KjPsd47iMKiZ3GFJ3zGYx1Q0WJ6zTxQTnu1JzrV/N ROpSZ1muQ9fZZuTOPU1vjWqRvs6HxkMKSa/fq9KzXugN4mnHXNrD8DUg4/DRHN+ejQbmRX 1mNT9WNQwURNyKDgE69R8NKhDiyYrhHYo7vm0wUWPMnSSpIgYi9CdHztDxRJ4KCzW65z5z sMAR38CW5rMBlMOLwR3Us0oKOtkg08VFMDSN7eqRtWCsHUFE3cozq+rtF8BQ22yLXS6xg9 6+Ywy08u4FIvqGnG33EKLcJ7cKelScieUfGu1WC+9hp9JYNUYFP1TdcFGlnhBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778882385; a=rsa-sha256; cv=none; b=FXROIgrfNSQ9lpodt+3Cp/D5cq1IuAXa/+m4KXUJgvPxQzpmgJmA6yiwlJBZLrEY5lFN4L V3i6h5pyyAhoMtKggzIw98wtRYeqxJWQCiBxMTBg43GtRFMvUQCBHb1RTq4z5Sw2kFlCrF Hzk+90LhIRV3QK9ZbrgNQtZyFlxTwNZ0oTzX5JIydchMhR0i/X3Z+CwRCMfu0hPdzAYsx6 NAZ6aMfSkiN7kDCL8QV5zP3wJSwRT5qOS4xYBFUj1jV9D0VVdymnvg2o/ezJiRyOv9jt9i XAFgFpd1tPMRg0Sa7qKJ94VkCj8mrb5o6dNlTxk2A6xshKeqUqEOJlJifCu95g== 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=1778882385; 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=XdqtFy2ex9sHtPWnZqtLvxLLRKWaS7jhIfvcFfaLc/A=; b=iMO/8fYEbcHeC393C1t/44SHt1saG1kJFLFAEdjSblJGqro96ukBFHqeQgU2iHhsTa5xab Xj8zRdihX9a3SxQKFoJ/557gN6MSEtCODapCASbA15+UZlcMuVwySHoMB0oVwcWzurOD73 +/wMeTpBMKESea3zstCqws7WGXiJNAemWLmqy8EHkCRv6CYXipBfIVfTiWrBYzsDGCPGLv 2XnKLcNc3SLV3zN0F4k03UHUAzQBhsn8LfnJmjQWOu734ZQeNsZSsWpu14UgSBrKLgBXrE Lijm97d/tSHfqnbcuwqZvn8jcDG4IULhdA4LxrFGmyXoRD5ccckuwAX1RdfJpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHLhd3HvrzBMw for ; Fri, 15 May 2026 21:59:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 418a8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 21:59:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: d201e4e84919 - main - wtap: use typed rssi and noise floor values 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 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/main X-Git-Reftype: branch X-Git-Commit: d201e4e8491901d1de6bcaeb581a0bf958bf86f2 Auto-Submitted: auto-generated Date: Fri, 15 May 2026 21:59:45 +0000 Message-Id: <6a079751.418a8.2996337e@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=d201e4e8491901d1de6bcaeb581a0bf958bf86f2 commit d201e4e8491901d1de6bcaeb581a0bf958bf86f2 Author: Bjoern A. Zeeb AuthorDate: 2026-05-13 21:14:39 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-05-15 21:59:07 +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 MFC after: 3 days Reviewed by: lwhsu, adrian Differential Revision: https://reviews.freebsd.org/D57020 --- 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 */