Skip to content

Commit

Permalink
wifi: mac80211: debug: omit link if non-MLO connection
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Johannes Berg committed Jul 15, 2022
1 parent b8375cf commit c5c48a1
Showing 1 changed file with 25 additions and 6 deletions.
31 changes: 25 additions & 6 deletions net/mac80211/debug.h
Original file line number Diff line number Diff line change
Expand Up @@ -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, \
Expand Down

0 comments on commit c5c48a1

Please sign in to comment.