From nobody Fri Aug 29 13:19:00 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 4cCzPJ4WFbz65Vrq; Fri, 29 Aug 2025 13:19: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 4cCzPJ2QrMz3V18; Fri, 29 Aug 2025 13:19:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756473540; 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=wq98z3P31TXS6H4h4c9ekNF+CMATd35bNJ0xt6H8Zc0=; b=jIR6qUEVFOXaJ6y/n1kE4dn/ulBpWHIp7E2/wiiW+txThZY8GSr0eb8j4fQXYqWKxu7z+n k+3j4+3DEYGxh6L1bPzOxNJJTbyXTUeBi0hjC2epMZrtq3GRezA4F9HdclLbpo0itjJO+8 5axMQ56S+YNqIUMpM4D6qo4HeY1piBpUTt0luzkffxJhui6CXZMn8NvyP85nRn/HwIH4Rn CN5eoe7vak0zhF2ANkA7t7Av/Uz6lvXqJ0kSDAcuVrZT7fxsLVhtWO/dwBLZ434Co9ALWl x1p1fbls8xAcpaG1LdpKdAkMzw6M3tbMowVR9gnSnnCiDB9/jkk0Cs/qlZwqNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756473540; 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=wq98z3P31TXS6H4h4c9ekNF+CMATd35bNJ0xt6H8Zc0=; b=OtUEz72pE7qATBfJ9QG6Dz7ioS7JAcxHaaDvP4BXOsaYePqLetypTwPOZANiEXX0doLUsz RaY0l45tqNhgD1n5IjfKwlzfq7VeCHYkOJ+hFzVvmdNGC9C7vnpz4sCJGXM12rUcjF9Ur4 ylt5GB0XQAyejdyhZfEVT2W5gUgIihMkcebMOrzuWxcISDRvmiBrJ2EfZNqKP3p4cZW+2u IHuw7gQxwKjt+jOY4zObEQT/wom3I63DRo8VHRlilA+isIPy8Ba4yAza6YAP7z3W8KzoRI hQQf9DRTHTMN+wvj8LNUUKNEUV7zSY8RSwvy+bt+bz1NpnKGBOwegvKYfYEcXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756473540; a=rsa-sha256; cv=none; b=QHrRQZrIuP+ShNNGvJpz3rvq5bTYGI6pwMT+mKoCW9KYaPg2TO1R1TJg5+lXLnxAz4Se5B gysCEAIe25K5FsMvn8gBLQq8BJBLP7fS3BkW/m/f5WqJpNNB3qmpu2+HilWRog0qUC5DoS WRKR1Y3ajHtSSfEmGj8PsjLZ1soCDqg4yiEvTZHnKH+aO7Ah7Iq1RAyTIQAqdTyvHCQFnu t3YTTtluP+ixyRTQnP6RdErsPoyx6dOlsA8af6rtj/3Ob5zpVes6AuoQJ996AgrY8Iid9d H6nJ88n43tfpYzysarl+KrLNyQ4jJEYfgjVvOdm9MXFwI/At/nJK8MZv9ju1aA== 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 4cCzPJ1ym7zhQX; Fri, 29 Aug 2025 13:19: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 57TDJ013072248; Fri, 29 Aug 2025 13:19:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57TDJ0M8072245; Fri, 29 Aug 2025 13:19:00 GMT (envelope-from git) Date: Fri, 29 Aug 2025 13:19:00 GMT Message-Id: <202508291319.57TDJ0M8072245@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: be1ae08d0a10 - main - LinuxKPI: 802.11: use ni_dtim_period instead of iv_dtim_period 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: be1ae08d0a10332893990f079d4bef1b64d5d4ff Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=be1ae08d0a10332893990f079d4bef1b64d5d4ff commit be1ae08d0a10332893990f079d4bef1b64d5d4ff Author: Bjoern A. Zeeb AuthorDate: 2025-08-25 19:17:01 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-08-29 13:18:42 +0000 LinuxKPI: 802.11: use ni_dtim_period instead of iv_dtim_period Both iwm(4) and iwx(4) are using the iv_dtim_period from the vap. This likely stems from the fact that ieee80211_sta_join() while setting up the ni basics does set the dtim_period on the vap (we should revist this in net80211) from the scan results. The problem with that is that once we are associated and are receiving beacons, sta_recv_mgmt() will handle the TIM IE and and save the tim period and tim count in ni_dtim_period and ni_dtim_count on the node. Given we need to inform the driver/firmware (at least for iwlwifi) with values from beacons received after assoc, the ni is the better place the take the value from (though the beacons hopefully stay consistent). Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 7f8182ef67b4..1f7a0fa9d9b0 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -1872,13 +1872,13 @@ lkpi_update_dtim_tsf(struct ieee80211_vif *vif, struct ieee80211_node *ni, vif->bss_conf.beacon_int = 16; bss_changed |= BSS_CHANGED_BEACON_INT; } - if (vif->bss_conf.dtim_period != vap->iv_dtim_period && - vap->iv_dtim_period > 0) { - vif->bss_conf.dtim_period = vap->iv_dtim_period; + if (vif->bss_conf.dtim_period != ni->ni_dtim_period && + ni->ni_dtim_period > 0) { + vif->bss_conf.dtim_period = ni->ni_dtim_period; bss_changed |= BSS_CHANGED_BEACON_INFO; } - vif->bss_conf.sync_dtim_count = vap->iv_dtim_count; + vif->bss_conf.sync_dtim_count = ni->ni_dtim_count; vif->bss_conf.sync_tsf = le64toh(ni->ni_tstamp.tsf); /* vif->bss_conf.sync_device_ts = set in linuxkpi_ieee80211_rx. */