From nobody Wed Jun 11 09:19:16 2025 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 4bHKq843Srz600XQ; Wed, 11 Jun 2025 09:19:16 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bHKq82cRNz3vll; Wed, 11 Jun 2025 09:19:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749633556; 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=Ojl9Atkvq9x80zd+o01p67e9YBRxgC6Byso5zOYE7Oo=; b=xxmq+/zS0yrS3s/L5Py6kBOLAEnbLeYZ62cp2RUwrAPYoAO+kG2ET4LMt5RhVfqJ3qKE5u fU6hW98J0Qjq3reRYqajgISlXRCoeaSqpyFVIAt5bE/03yBNV/QbKk4ey1hs0hfQD76va8 G3xLV6Hi8GMFz/A5fTHLmY6ZlSlJ/LtPytOkdDtCKrlN9NupJXc2/bOr9GUyL0r9mvALzD XkP4GywnS9S56AKR5T1hx8AXj9TbiG/jaBKjwKIzcOivjxw9fh0zzsucSqwqHnnqoLuwjF SaLKAV80vCbM0EoCBv7w869HdXg9225+LKPBwl2+pmSV4RTuUwTsYh2FHyFYVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749633556; 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=Ojl9Atkvq9x80zd+o01p67e9YBRxgC6Byso5zOYE7Oo=; b=p8PWPym2Yk2XNJfqtpZS5cyPQuvrKqgZ7jBbt8Mfc5q+txrjHAhGBeWFtVpIdEsBQngaV6 X7YRtHtiiGRPOOCMp0+G3DQUJ6Jm8VjY+xNRKIDdDawW4KU95HuCQ0HXobKsd5mecj399y IvLbcPGC/TsjlHEiHLUhkCpmbZFtynw5Bxc9aBktlb0jDdHCs/fD6MZcBQb93uLXTVj7ud Noq4XEQxTIJ/8Z8JWtpVNjpLbeGln0daw1cNeyC0SNgljDph6uO3LatV5rCZL8TaxRraIX 5xb+6A/ykJOGPQZnezril/ESSpyGpmtisJzt7z8Zvf58pvgwNbhOcubwgLs8FA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749633556; a=rsa-sha256; cv=none; b=P/0nIH/2X9XNWFkkpuuMlJ+24gO3IkkUuRybdJIruQbVoT8L6Jb58wnNy2FPH/41V4aeTY eUKiJYYKr8q7B3YrPwFbeLKyG6NoUQbNkH4/FJxUFvS0O3hQUxBBTUS3yfoGwBBaS0EfVp Eu7xtJUyIdyWWm+dRbjVrEmJeqanFOolbbSUuuSqfIyR+Km3L0cesQ+80lvmUzEKGYxWZg gD66RuzDmhxFWscRMamp/XKrR4B6SLLCxTfdXPHHB5PrAPlGfAJMyX8D7oRF0ETKJpele3 B+6L0j5NnCuitFbCx0q6qvZTXkjS9fBzDz8rUbCdncBqsYb9r4pySc3zjBMufQ== 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 4bHKq8228jz5SZ; Wed, 11 Jun 2025 09:19:16 +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 55B9JG7K064403; Wed, 11 Jun 2025 09:19:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55B9JGnZ064400; Wed, 11 Jun 2025 09:19:16 GMT (envelope-from git) Date: Wed, 11 Jun 2025 09:19:16 GMT Message-Id: <202506110919.55B9JGnZ064400@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 5e5832bdc440 - stable/14 - LinuxKPI: 802.11: cast jiffies to unsigned long 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 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/14 X-Git-Reftype: branch X-Git-Commit: 5e5832bdc440b130a549fcad8cf266fd6e054b1b Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=5e5832bdc440b130a549fcad8cf266fd6e054b1b commit 5e5832bdc440b130a549fcad8cf266fd6e054b1b Author: Bjoern A. Zeeb AuthorDate: 2025-06-11 09:16:51 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-06-11 09:16:51 +0000 LinuxKPI: 802.11: cast jiffies to unsigned long The joffoes changes are not (yet) merged if they will be. In order to not break a possible future MFC of them, cast jiffies to unsigned long already. They are only used in logging/debugging here. Sponsored by: The FreeBSD Foundation Fixes: dcc99bf830b2 --- sys/compat/linuxkpi/common/src/linux_80211.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index a5982511fb24..c1eb6d6200ae 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -1246,7 +1246,7 @@ lkpi_sta_del_keys(struct ieee80211_hw *hw, struct ieee80211_vif *vif, if (linuxkpi_debug_80211 & D80211_TRACE_HW_CRYPTO) ic_printf(lsta->ni->ni_ic, "%d %lu %s: running set_key cmd %d(%s) for " "sta %6D: keyidx %u hw_key_idx %u flags %b\n", - curthread->td_tid, jiffies, __func__, + curthread->td_tid, (unsigned long)jiffies, __func__, DISABLE_KEY, "DISABLE", lsta->sta.addr, ":", kc->keyidx, kc->hw_key_idx, kc->flags, IEEE80211_KEY_FLAG_BITS); #endif @@ -1255,7 +1255,7 @@ lkpi_sta_del_keys(struct ieee80211_hw *hw, struct ieee80211_vif *vif, LSTA_TO_STA(lsta), kc); if (err != 0) { ic_printf(lsta->ni->ni_ic, "%d %lu %s: set_key cmd %d(%s) for " - "sta %6D failed: %d\n", curthread->td_tid, jiffies, __func__, + "sta %6D failed: %d\n", curthread->td_tid, (unsigned long)jiffies, __func__, DISABLE_KEY, "DISABLE", lsta->sta.addr, ":", err); error++; @@ -1270,7 +1270,7 @@ lkpi_sta_del_keys(struct ieee80211_hw *hw, struct ieee80211_vif *vif, if (linuxkpi_debug_80211 & D80211_TRACE_HW_CRYPTO) ic_printf(lsta->ni->ni_ic, "%d %lu %s: set_key cmd %d(%s) for " "sta %6D succeeded: keyidx %u hw_key_idx %u flags %b\n", - curthread->td_tid, jiffies, __func__, + curthread->td_tid, (unsigned long)jiffies, __func__, DISABLE_KEY, "DISABLE", lsta->sta.addr, ":", kc->keyidx, kc->hw_key_idx, kc->flags, IEEE80211_KEY_FLAG_BITS); #endif @@ -1336,7 +1336,7 @@ lkpi_iv_key_delete(struct ieee80211vap *vap, const struct ieee80211_key *k) if (linuxkpi_debug_80211 & D80211_TRACE_HW_CRYPTO) ic_printf(ic, "%d %lu %s: sta %6D and no key information, " "keyidx %u wk_macaddr %6D; returning success\n", - curthread->td_tid, jiffies, __func__, sta->addr, ":", + curthread->td_tid, (unsigned long)jiffies, __func__, sta->addr, ":", k->wk_keyix, k->wk_macaddr, ":"); #endif ieee80211_free_node(ni); @@ -1348,7 +1348,7 @@ lkpi_iv_key_delete(struct ieee80211vap *vap, const struct ieee80211_key *k) if (linuxkpi_debug_80211 & D80211_TRACE_HW_CRYPTO) ic_printf(ic, "%d %lu %s: running set_key cmd %d(%s) for sta %6D: " "keyidx %u hw_key_idx %u flags %b\n", - curthread->td_tid, jiffies, __func__, + curthread->td_tid, (unsigned long)jiffies, __func__, DISABLE_KEY, "DISABLE", sta->addr, ":", kc->keyidx, kc->hw_key_idx, kc->flags, IEEE80211_KEY_FLAG_BITS); #endif @@ -1357,7 +1357,7 @@ lkpi_iv_key_delete(struct ieee80211vap *vap, const struct ieee80211_key *k) error = lkpi_80211_mo_set_key(hw, DISABLE_KEY, vif, sta, kc); if (error != 0) { ic_printf(ic, "%d %lu %s: set_key cmd %d(%s) for sta %6D failed: %d\n", - curthread->td_tid, jiffies, __func__, + curthread->td_tid, (unsigned long)jiffies, __func__, DISABLE_KEY, "DISABLE", sta->addr, ":", error); error = 0; goto out; @@ -1367,7 +1367,7 @@ lkpi_iv_key_delete(struct ieee80211vap *vap, const struct ieee80211_key *k) if (linuxkpi_debug_80211 & D80211_TRACE_HW_CRYPTO) ic_printf(ic, "%d %lu %s: set_key cmd %d(%s) for sta %6D succeeded: " "keyidx %u hw_key_idx %u flags %b\n", - curthread->td_tid, jiffies, __func__, + curthread->td_tid, (unsigned long)jiffies, __func__, DISABLE_KEY, "DISABLE", sta->addr, ":", kc->keyidx, kc->hw_key_idx, kc->flags, IEEE80211_KEY_FLAG_BITS); #endif @@ -1493,7 +1493,7 @@ lkpi_iv_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k) if (linuxkpi_debug_80211 & D80211_TRACE_HW_CRYPTO) ic_printf(ic, "%d %lu %s: running set_key cmd %d(%s) for sta %6D: " "kc %p keyidx %u hw_key_idx %u keylen %u flags %b\n", - curthread->td_tid, jiffies, __func__, + curthread->td_tid, (unsigned long)jiffies, __func__, SET_KEY, "SET", sta->addr, ":", kc, kc->keyidx, kc->hw_key_idx, kc->keylen, kc->flags, IEEE80211_KEY_FLAG_BITS); #endif @@ -1503,7 +1503,7 @@ lkpi_iv_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k) error = lkpi_80211_mo_set_key(hw, SET_KEY, vif, sta, kc); if (error != 0) { ic_printf(ic, "%d %lu %s: set_key cmd %d(%s) for sta %6D failed: %d\n", - curthread->td_tid, jiffies, __func__, + curthread->td_tid, (unsigned long)jiffies, __func__, SET_KEY, "SET", sta->addr, ":", error); lsta->kc[k->wk_keyix] = NULL; free(kc, M_LKPI80211); @@ -1515,7 +1515,7 @@ lkpi_iv_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k) if (linuxkpi_debug_80211 & D80211_TRACE_HW_CRYPTO) ic_printf(ic, "%d %lu %s: set_key cmd %d(%s) for sta %6D succeeded: " "kc %p keyidx %u hw_key_idx %u flags %b\n", - curthread->td_tid, jiffies, __func__, + curthread->td_tid, (unsigned long)jiffies, __func__, SET_KEY, "SET", sta->addr, ":", kc, kc->keyidx, kc->hw_key_idx, kc->flags, IEEE80211_KEY_FLAG_BITS); #endif @@ -1596,7 +1596,7 @@ lkpi_iv_key_update_begin(struct ieee80211vap *vap) if (linuxkpi_debug_80211 & D80211_TRACE_HW_CRYPTO) ic_printf(ic, "%d %lu %s: vap %p ic %p %slocked nt %p %slocked " "lvif ic_unlocked %d nt_unlocked %d\n", - curthread->td_tid, jiffies, __func__, vap, + curthread->td_tid, (unsigned long)jiffies, __func__, vap, ic, icislocked ? "" : "un", nt, ntislocked ? "" : "un", lvif->ic_unlocked, lvif->nt_unlocked); #endif @@ -1669,7 +1669,7 @@ lkpi_iv_key_update_end(struct ieee80211vap *vap) if (linuxkpi_debug_80211 & D80211_TRACE_HW_CRYPTO) ic_printf(ic, "%d %lu %s: vap %p ic %p %slocked nt %p %slocked " "lvif ic_unlocked %d nt_unlocked %d\n", - curthread->td_tid, jiffies, __func__, vap, + curthread->td_tid, (unsigned long)jiffies, __func__, vap, ic, icislocked ? "" : "un", nt, ntislocked ? "" : "un", lvif->ic_unlocked, lvif->nt_unlocked); #endif