The branch stable/14 has been updated by bz:
URL:
https://cgit.FreeBSD.org/src/commit/?id=5e5832bdc440b130a549fcad8cf266fd6e054b1b
commit 5e5832bdc440b130a549fcad8cf266fd6e054b1b
Author: Bjoern A. Zeeb <b...@freebsd.org>
AuthorDate: 2025-06-11 09:16:51 +0000
Commit: Bjoern A. Zeeb <b...@freebsd.org>
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
