Page MenuHomeFreeBSD
Files F149072208

D39673.id120612.diff
No OneTemporary
Actions

D39673.id120612.diff
View Options

diff --git a/sys/contrib/dev/iwlwifi/fw/dbg.h b/sys/contrib/dev/iwlwifi/fw/dbg.h
--- a/sys/contrib/dev/iwlwifi/fw/dbg.h
+++ b/sys/contrib/dev/iwlwifi/fw/dbg.h
@@ -164,7 +164,11 @@
if (!iwl_fw_dbg_trigger_check_stop(fwrt, wdev, trigger))
return;
+#if defined(__linux__)
iwl_fw_dbg_collect_trig(fwrt, trigger, NULL);
+#elif defined(__FreeBSD__)
+ iwl_fw_dbg_collect_trig(fwrt, trigger, "");
+#endif
}
#define iwl_fw_dbg_trigger_simple_stop(fwrt, wdev, trig) \
diff --git a/sys/contrib/dev/iwlwifi/iwl-debug.c b/sys/contrib/dev/iwlwifi/iwl-debug.c
--- a/sys/contrib/dev/iwlwifi/iwl-debug.c
+++ b/sys/contrib/dev/iwlwifi/iwl-debug.c
@@ -49,7 +49,7 @@
\
va_start(args, fmt); \
vaf.va = &args; \
- vasprintf(&str, M_KMALLOC, fmt, args); \
+ vasprintf(&str, M_KMALLOC, vaf.fmt, args); \
dev_ ##fn(dev, "%s", str); \
trace_iwlwifi_ ##fn(&vaf); \
free(str, M_KMALLOC); \
@@ -88,7 +88,7 @@
dev_err(dev, "%pV", &vaf);
#elif defined(__FreeBSD__)
char *str;
- vasprintf(&str, M_KMALLOC, fmt, args2);
+ vasprintf(&str, M_KMALLOC, vaf.fmt, args2);
dev_err(dev, "%s%s", (mode == IWL_ERR_MODE_RFKILL) ? "(RFKILL)" : "", str);
free(str, M_KMALLOC);
#endif
@@ -154,7 +154,7 @@
dev_printk(KERN_DEBUG, dev, "%s %pV", function, &vaf);
#elif defined(__FreeBSD__)
char *str;
- vasprintf(&str, M_KMALLOC, fmt, args);
+ vasprintf(&str, M_KMALLOC, vaf.fmt, args);
dev_printk(KERN_DEBUG, dev, "%d %u %s %s",
curthread->td_tid, (unsigned int)ticks, function, str);
free(str, M_KMALLOC);
diff --git a/sys/contrib/dev/iwlwifi/mvm/mac-ctxt.c b/sys/contrib/dev/iwlwifi/mvm/mac-ctxt.c
--- a/sys/contrib/dev/iwlwifi/mvm/mac-ctxt.c
+++ b/sys/contrib/dev/iwlwifi/mvm/mac-ctxt.c
@@ -1438,7 +1438,11 @@
if (rx_missed_bcon_since_rx >= stop_trig_missed_bcon_since_rx ||
rx_missed_bcon >= stop_trig_missed_bcon)
+#if defined(__linux__)
iwl_fw_dbg_collect_trig(&mvm->fwrt, trigger, NULL);
+#elif defined(__FreeBSD__)
+ iwl_fw_dbg_collect_trig(&mvm->fwrt, trigger, "");
+#endif
out:
rcu_read_unlock();
diff --git a/sys/contrib/dev/iwlwifi/mvm/rx.c b/sys/contrib/dev/iwlwifi/mvm/rx.c
--- a/sys/contrib/dev/iwlwifi/mvm/rx.c
+++ b/sys/contrib/dev/iwlwifi/mvm/rx.c
@@ -427,7 +427,11 @@
if (rx_status->signal < rssi)
iwl_fw_dbg_collect_trig(&mvm->fwrt, trig,
+#if defined(__linux__)
NULL);
+#elif defined(__FreeBSD__)
+ "");
+#endif
}
if (!mvm->tcm.paused && len >= sizeof(*hdr) &&
@@ -692,7 +696,11 @@
if (le32_to_cpup((__le32 *) (pkt->data + trig_offset)) < trig_thold)
return;
+#if defined(__linux__)
iwl_fw_dbg_collect_trig(&mvm->fwrt, trig, NULL);
+#elif defined(__FreeBSD__)
+ iwl_fw_dbg_collect_trig(&mvm->fwrt, trig, "");
+#endif
}
static void iwl_mvm_stats_energy_iter(void *_data,
diff --git a/sys/contrib/dev/iwlwifi/mvm/rxmq.c b/sys/contrib/dev/iwlwifi/mvm/rxmq.c
--- a/sys/contrib/dev/iwlwifi/mvm/rxmq.c
+++ b/sys/contrib/dev/iwlwifi/mvm/rxmq.c
@@ -1958,7 +1958,11 @@
if (rx_status->signal < rssi)
iwl_fw_dbg_collect_trig(&mvm->fwrt, trig,
+#if defined(__linux__)
NULL);
+#elif defined(__FreeBSD__)
+ "");
+#endif
}
if (ieee80211_is_data(hdr->frame_control))
diff --git a/sys/contrib/dev/rtw88/debug.c b/sys/contrib/dev/rtw88/debug.c
--- a/sys/contrib/dev/rtw88/debug.c
+++ b/sys/contrib/dev/rtw88/debug.c
@@ -1284,7 +1284,7 @@
#if defined(__linux__)
dev_printk(KERN_DEBUG, rtwdev->dev, "%pV", &vaf);
#elif defined(__FreeBSD__)
- vlog(LOG_DEBUG, fmt, args);
+ vlog(LOG_DEBUG, vaf.fmt, args);
#endif
va_end(args);
diff --git a/sys/contrib/dev/rtw89/debug.c b/sys/contrib/dev/rtw89/debug.c
--- a/sys/contrib/dev/rtw89/debug.c
+++ b/sys/contrib/dev/rtw89/debug.c
@@ -2655,7 +2655,7 @@
#elif defined(__FreeBSD__)
{
char *str;
- vasprintf(&str, M_KMALLOC, fmt, args);
+ vasprintf(&str, M_KMALLOC, vaf.fmt, args);
dev_printk(KERN_DEBUG, rtwdev->dev, "%s", str);
free(str, M_KMALLOC);
}
diff --git a/sys/modules/iwlwifi/Makefile b/sys/modules/iwlwifi/Makefile
--- a/sys/modules/iwlwifi/Makefile
+++ b/sys/modules/iwlwifi/Makefile
@@ -63,10 +63,4 @@
#CFLAGS+= -DCONFIG_THERMAL=1
#CFLAGS+= -DCONFIG_EFI=1
-# GCC warns about NULL format strings passed to iwl_fw_dbg_collect_trig
-CWARNFLAGS.gcc+= -Wno-format
-
-# GCC warns about set but unused vaf variables
-CWARNFLAGS.iwl-debug.c+= ${NO_WUNUSED_BUT_SET_VARIABLE}
-
.include <bsd.kmod.mk>
diff --git a/sys/modules/rtw88/Makefile b/sys/modules/rtw88/Makefile
--- a/sys/modules/rtw88/Makefile
+++ b/sys/modules/rtw88/Makefile
@@ -40,7 +40,4 @@
CFLAGS+= -DCONFIG_RTW88_DEBUG
#CFLAGS+= -DCONFIG_RTW88_DEBUGFS
-# GCC warns about set but unused vaf variables
-CWARNFLAGS.debug.c+= ${NO_WUNUSED_BUT_SET_VARIABLE}
-
.include <bsd.kmod.mk>

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 23, 3:29 AM (8 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30156541
Default Alt Text
D39673.id120612.diff (4 KB)

Event Timeline