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>

diff --git a/net/mac80211/debug.h b/net/mac80211/debug.h
index 3302e8da0314e952781115394e17d20b7ecaf4e8..b4c20f5e778e09b106eb7acab4bdae3dcf8f3dce 100644 (file)
--- 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,                                   \