mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-07-19 01:56:59 +08:00
33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
--- a/net/mac80211/trace.h
|
|
+++ b/net/mac80211/trace.h
|
|
@@ -31,9 +31,15 @@
|
|
#define VIF_ENTRY __field(enum nl80211_iftype, vif_type) __field(void *, sdata) \
|
|
__field(bool, p2p) \
|
|
__string(vif_name, sdata->name)
|
|
+#if LINUX_VERSION_IS_GEQ(6,10,0)
|
|
+#define VIF_ASSIGN __entry->vif_type = sdata->vif.type; __entry->sdata = sdata; \
|
|
+ __entry->p2p = sdata->vif.p2p; \
|
|
+ __assign_str(vif_name)
|
|
+#else
|
|
#define VIF_ASSIGN __entry->vif_type = sdata->vif.type; __entry->sdata = sdata; \
|
|
__entry->p2p = sdata->vif.p2p; \
|
|
__assign_str(vif_name, sdata->name)
|
|
+#endif
|
|
#define VIF_PR_FMT " vif:%s(%d%s)"
|
|
#define VIF_PR_ARG __get_str(vif_name), __entry->vif_type, __entry->p2p ? "/p2p" : ""
|
|
|
|
--- a/net/wireless/trace.h
|
|
+++ b/net/wireless/trace.h
|
|
@@ -364,7 +364,11 @@ TRACE_EVENT(rdev_add_virtual_intf,
|
|
),
|
|
TP_fast_assign(
|
|
WIPHY_ASSIGN;
|
|
+#if LINUX_VERSION_IS_GEQ(6,10,0)
|
|
+ __assign_str(vir_intf_name);
|
|
+#else
|
|
__assign_str(vir_intf_name, name ? name : "<noname>");
|
|
+#endif
|
|
__entry->type = type;
|
|
),
|
|
TP_printk(WIPHY_PR_FMT ", virtual intf name: %s, type: %d",
|