summaryrefslogtreecommitdiffstats
path: root/net/mac80211/debug.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2022-06-22 14:30:20 +0200
committerJohannes Berg <johannes.berg@intel.com>2022-07-15 11:43:14 +0200
commitc5c48a11dd86c7f9d86b8c4cc8eaed350ffd1ea7 (patch)
tree5bd7ae8fa09e21ec9a1120a810e4e3338ce2b74b /net/mac80211/debug.h
parentwifi: mac80211_hwsim: Ack link addressed frames (diff)
downloadlinux-c5c48a11dd86c7f9d86b8c4cc8eaed350ffd1ea7.tar.xz
linux-c5c48a11dd86c7f9d86b8c4cc8eaed350ffd1ea7.zip
wifi: mac80211: debug: omit link if non-MLO connection
If we don't really have multiple links, omit the link ID from link debug prints, otherwise we change the format for all of the existing drivers (most of which might never support MLO), and also have extra noise in the logs. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/debug.h')
-rw-r--r--net/mac80211/debug.h31
1 files changed, 25 insertions, 6 deletions
diff --git a/net/mac80211/debug.h b/net/mac80211/debug.h
index 3302e8da0314..b4c20f5e778e 100644
--- a/net/mac80211/debug.h
+++ b/net/mac80211/debug.h
@@ -135,14 +135,33 @@ do { \
_sdata_dbg(1, sdata, fmt, ##__VA_ARGS__)
#define link_info(link, fmt, ...) \
- _sdata_info((link)->sdata, "[link %d] " fmt, (link)->link_id, \
- ##__VA_ARGS__)
+ do { \
+ if ((link)->sdata->vif.valid_links) \
+ _sdata_info((link)->sdata, "[link %d] " fmt, \
+ (link)->link_id, \
+ ##__VA_ARGS__); \
+ else \
+ _sdata_info((link)->sdata, fmt, ##__VA_ARGS__); \
+ } while (0)
#define link_err(link, fmt, ...) \
- _sdata_err((link)->sdata, "[link %d] " fmt, (link)->link_id, \
- ##__VA_ARGS__)
+ do { \
+ if ((link)->sdata->vif.valid_links) \
+ _sdata_err((link)->sdata, "[link %d] " fmt, \
+ (link)->link_id, \
+ ##__VA_ARGS__); \
+ else \
+ _sdata_err((link)->sdata, fmt, ##__VA_ARGS__); \
+ } while (0)
#define link_dbg(link, fmt, ...) \
- _sdata_dbg(1, (link)->sdata, "[link %d] " fmt, (link)->link_id, \
- ##__VA_ARGS__)
+ do { \
+ if ((link)->sdata->vif.valid_links) \
+ _sdata_dbg(1, (link)->sdata, "[link %d] " fmt, \
+ (link)->link_id, \
+ ##__VA_ARGS__); \
+ else \
+ _sdata_dbg(1, (link)->sdata, fmt, \
+ ##__VA_ARGS__); \
+ } while (0)
#define ht_dbg(sdata, fmt, ...) \
_sdata_dbg(MAC80211_HT_DEBUG, \