Patchwork [1/1] dccp: re-enable debug macro

login
register
mail settings
Submitter Gerrit Renker
Date Feb. 14, 2014, 2:02 a.m.
Message ID <20140213190233.0f0889a4@liptov.cs.ualberta.ca>
Download mbox | patch
Permalink /patch/320273/
State Accepted
Delegated to: David Miller
Headers show

Comments

Gerrit Renker - Feb. 14, 2014, 2:02 a.m.
dccp tfrc: revert

This reverts 6aee49c558de (Jan 4, 2014) since the variable tfrc_debug is
referenced by the tfrc_pr_debug(fmt, ...) macro when TFRC debugging is
enabled. If it is enabled, use of the macro produces a compilation error.

Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
---
 net/dccp/ccids/lib/tfrc.c |    2 +-
 net/dccp/ccids/lib/tfrc.h |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Feb. 14, 2014, 5:35 a.m.
From: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Date: Thu, 13 Feb 2014 19:02:33 -0700

> dccp tfrc: revert
> 
> This reverts 6aee49c558de (Jan 4, 2014) since the variable tfrc_debug is
> referenced by the tfrc_pr_debug(fmt, ...) macro when TFRC debugging is
> enabled. If it is enabled, use of the macro produces a compilation error.
> 
> Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>

Applied, thanks Gerrit.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

--- a/net/dccp/ccids/lib/tfrc.c
+++ b/net/dccp/ccids/lib/tfrc.c
@@ -8,7 +8,7 @@ 
 #include "tfrc.h"
 
 #ifdef CONFIG_IP_DCCP_TFRC_DEBUG
-static bool tfrc_debug;
+bool tfrc_debug;
 module_param(tfrc_debug, bool, 0644);
 MODULE_PARM_DESC(tfrc_debug, "Enable TFRC debug messages");
 #endif
--- a/net/dccp/ccids/lib/tfrc.h
+++ b/net/dccp/ccids/lib/tfrc.h
@@ -21,6 +21,7 @@ 
 #include "packet_history.h"
 
 #ifdef CONFIG_IP_DCCP_TFRC_DEBUG
+extern bool tfrc_debug;
 #define tfrc_pr_debug(format, a...)	DCCP_PR_DEBUG(tfrc_debug, format, ##a)
 #else
 #define tfrc_pr_debug(format, a...)