git: cb5c07649aa0 - main - net80211: add func/line information to IEEE80211_DISCARD* macros

Bjoern A. Zeeb bz at FreeBSD.org
Sat Sep 4 09:30:31 UTC 2021


The branch main has been updated by bz:

URL: https://cgit.FreeBSD.org/src/commit/?id=cb5c07649aa005abb1e847c2cd5f816d762efb93

commit cb5c07649aa005abb1e847c2cd5f816d762efb93
Author:     Bjoern A. Zeeb <bz at FreeBSD.org>
AuthorDate: 2021-09-04 09:24:51 +0000
Commit:     Bjoern A. Zeeb <bz at FreeBSD.org>
CommitDate: 2021-09-04 09:24:51 +0000

    net80211: add func/line information to IEEE80211_DISCARD* macros
    
    While debugging is very good in net80211, some log messages are
    repeated in multiple places 1:1.  In order to distinguish where the
    discard happened and to speed up analysis, add __func__:__LINE__
    information to all these messages.
    
    Sponsored by:   The FreeBSD Foundation
    MFC after:      1 week
---
 sys/net80211/ieee80211_var.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/sys/net80211/ieee80211_var.h b/sys/net80211/ieee80211_var.h
index 350c9b98441d..e70b7f8e2bb6 100644
--- a/sys/net80211/ieee80211_var.h
+++ b/sys/net80211/ieee80211_var.h
@@ -1067,15 +1067,18 @@ void	ieee80211_note_frame(const struct ieee80211vap *,
  */
 #define	IEEE80211_DISCARD(_vap, _m, _wh, _type, _fmt, ...) do {		\
 	if ((_vap)->iv_debug & (_m))					\
-		ieee80211_discard_frame(_vap, _wh, _type, _fmt, __VA_ARGS__);\
+		ieee80211_discard_frame(_vap, _wh, _type,		\
+		   "%s:%d: " _fmt, __func__, __LINE__, __VA_ARGS__);	\
 } while (0)
 #define	IEEE80211_DISCARD_IE(_vap, _m, _wh, _type, _fmt, ...) do {	\
 	if ((_vap)->iv_debug & (_m))					\
-		ieee80211_discard_ie(_vap, _wh, _type, _fmt, __VA_ARGS__);\
+		ieee80211_discard_ie(_vap, _wh, _type,			\
+		    "%s:%d: " _fmt, __func__, __LINE__, __VA_ARGS__);	\
 } while (0)
 #define	IEEE80211_DISCARD_MAC(_vap, _m, _mac, _type, _fmt, ...) do {	\
 	if ((_vap)->iv_debug & (_m))					\
-		ieee80211_discard_mac(_vap, _mac, _type, _fmt, __VA_ARGS__);\
+		ieee80211_discard_mac(_vap, _mac, _type,		\
+		    "%s:%d: " _fmt, __func__, __LINE__, __VA_ARGS__);	\
 } while (0)
 
 void ieee80211_discard_frame(const struct ieee80211vap *,


More information about the dev-commits-src-main mailing list