From a34f3206affd6ab4ade381da7f868bfb67509a36 Mon Sep 17 00:00:00 2001 From: Holger Schurig Date: Fri, 25 May 2007 11:52:42 -0400 Subject: [PATCH] --- yaml --- r: 57629 b: refs/heads/master c: ed37b51610ff4e853893a92bb725bab99d17b236 h: refs/heads/master i: 57627: 67699c56854d73813b5bc4d875410a824d71389e v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/libertas/defs.h | 2 +- trunk/drivers/net/wireless/libertas/main.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9e770142b187..374415f757c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 78523daa86cf0b02c4d2f73b962c04ad565e9140 +refs/heads/master: ed37b51610ff4e853893a92bb725bab99d17b236 diff --git a/trunk/drivers/net/wireless/libertas/defs.h b/trunk/drivers/net/wireless/libertas/defs.h index d69f954ccf9d..7e8e7ac21786 100644 --- a/trunk/drivers/net/wireless/libertas/defs.h +++ b/trunk/drivers/net/wireless/libertas/defs.h @@ -50,7 +50,7 @@ do { if ((libertas_debug & (grp)) == (grp)) \ #endif #define lbs_deb_enter(grp) \ - LBS_DEB_LL(grp | LBS_DEB_ENTER, "%s() %d enter\n", __FUNCTION__, __LINE__); + LBS_DEB_LL(grp | LBS_DEB_ENTER, "%s():%d enter\n", __FUNCTION__, __LINE__); #define lbs_deb_enter_args(grp, fmt, args...) \ LBS_DEB_LL(grp | LBS_DEB_ENTER, "%s(" fmt "):%d\n", __FUNCTION__, ## args, __LINE__); #define lbs_deb_leave(grp) \ diff --git a/trunk/drivers/net/wireless/libertas/main.c b/trunk/drivers/net/wireless/libertas/main.c index abba7ec499b2..b0cc42b67efb 100644 --- a/trunk/drivers/net/wireless/libertas/main.c +++ b/trunk/drivers/net/wireless/libertas/main.c @@ -1130,9 +1130,9 @@ void libertas_interrupt(struct net_device *dev) { wlan_private *priv = dev->priv; - lbs_deb_enter(LBS_DEB_MAIN); + lbs_deb_enter(LBS_DEB_THREAD); - lbs_deb_main("libertas_interrupt: intcounter=%d\n", + lbs_deb_thread("libertas_interrupt: intcounter=%d\n", priv->adapter->intcounter); priv->adapter->intcounter++; @@ -1144,7 +1144,7 @@ void libertas_interrupt(struct net_device *dev) wake_up_interruptible(&priv->mainthread.waitq); - lbs_deb_leave(LBS_DEB_MAIN); + lbs_deb_leave(LBS_DEB_THREAD); } static int wlan_init_module(void)