removed duplicated code.

added MODULE_PARM_DESCs for debug and stats_timer.

git-svn-id: svn://svn.berlios.de//socketcan/trunk@227 030b6a49-0b11-0410-94ab-b0dab22257f2

diff --git a/kernel/2.6/include/linux/can/core.h b/kernel/2.6/include/linux/can/core.h
index e1a2e4c8e24a57c75fdf4d5f89d3d7a55df4148d..ad1337643c45aa1c37aaad3db0825f6bc33cde12 100644 (file)
--- a/kernel/2.6/include/linux/can/core.h
+++ b/kernel/2.6/include/linux/can/core.h
@@ -56,9 +56,6 @@ struct can_proto {
 
 /* function prototypes for the CAN networklayer core (af_can.c) */
 
-void can_debug_skb(struct sk_buff *skb);
-void can_debug_cframe(const char *msg, struct can_frame *cframe, ...);
-
 int can_proto_register(struct can_proto *cp);
 int can_proto_unregister(struct can_proto *cp);
 
@@ -77,4 +74,18 @@ int can_send(struct sk_buff *skb, int loop);
 
 unsigned long timeval2jiffies(struct timeval *tv, int round_up);
 
+#ifdef CONFIG_CAN_DEBUG_CORE
+void can_debug_skb(struct sk_buff *skb);
+void can_debug_cframe(const char *msg, struct can_frame *cframe, ...);
+#define DBG(args...)       (debug & 1 ? \
+                              (printk(KERN_DEBUG "can-%s %s: ", \
+                               IDENT, __func__), printk(args)) : 0)
+#define DBG_FRAME(args...) (debug & 2 ? can_debug_cframe(args) : 0)
+#define DBG_SKB(skb)       (debug & 4 ? can_debug_skb(skb) : 0)
+#else
+#define DBG(args...)
+#define DBG_FRAME(args...)
+#define DBG_SKB(skb)
+#endif
+
 #endif /* CAN_CORE_H */

diff --git a/kernel/2.6/net/can/af_can.c b/kernel/2.6/net/can/af_can.c
index 1e4e1583f77eaeee37f61d2003c576ac9d87d189..fa7c51f379120502bc9c1cdeee864499798793fa 100644 (file)
--- a/kernel/2.6/net/can/af_can.c
+++ b/kernel/2.6/net/can/af_can.c
@@ -68,7 +68,7 @@
 #include <linux/can/version.h> /* for RCSID. Removed by mkpatch script */
 RCSID("$Id$");
 
-#define IDENT "af_can"
+#define IDENT "core"
 static __initdata const char banner[] =
        KERN_INFO "CAN: Controller Area Network PF_CAN core " CAN_VERSION "\n";
 
@@ -79,19 +79,12 @@ MODULE_AUTHOR("Urs Thuermann <urs.thuermann@volkswagen.de>, "
 
 int stats_timer = 1; /* default: on */
 module_param(stats_timer, int, S_IRUGO);
+MODULE_PARM_DESC(stats_timer, "enable timer for statistics (default:on)");
 
 #ifdef CONFIG_CAN_DEBUG_CORE
 static int debug = 0;
 module_param(debug, int, S_IRUGO);
-#define DBG(args...)       (debug & 1 ? \
-                              (printk(KERN_DEBUG "CAN %s: ", __func__), \
-                               printk(args)) : 0)
-#define DBG_FRAME(args...) (debug & 2 ? can_debug_cframe(args) : 0)
-#define DBG_SKB(skb)       (debug & 4 ? can_debug_skb(skb) : 0)
-#else
-#define DBG(args...)
-#define DBG_FRAME(args...)
-#define DBG_SKB(skb)
+MODULE_PARM_DESC(debug, "debug print mask: 1:debug, 2:frames, 4:skbs");
 #endif
 
 static __init int  can_init(void);

diff --git a/kernel/2.6/net/can/bcm.c b/kernel/2.6/net/can/bcm.c
index a1ac530cf3c36823bbd186c96f36916acf1f78f0..ca8f35ddd393994b900e24e00ab28ff39625ec45 100644 (file)
--- a/kernel/2.6/net/can/bcm.c
+++ b/kernel/2.6/net/can/bcm.c
@@ -58,20 +58,6 @@
 #include <linux/can/version.h> /* for RCSID. Removed by mkpatch script */
 RCSID("$Id$");
 
-#ifdef CONFIG_CAN_DEBUG_CORE
-static int debug = 0;
-module_param(debug, int, S_IRUGO);
-#define DBG(args...)       (debug & 1 ? \
-                              (printk(KERN_DEBUG "BCM %s: ", __func__), \
-                               printk(args)) : 0)
-#define DBG_FRAME(args...) (debug & 2 ? can_debug_cframe(args) : 0)
-#define DBG_SKB(skb)       (debug & 4 ? can_debug_skb(skb) : 0)
-#else
-#define DBG(args...)
-#define DBG_FRAME(args...)
-#define DBG_SKB(skb)
-#endif
-
 /* use of last_frames[index].can_dlc */
 #define RX_RECV    0x40 /* received data for this element */
 #define RX_THR     0x80 /* element not been sent due to throttle feature */
@@ -89,6 +75,12 @@ MODULE_DESCRIPTION("PF_CAN bcm sockets");
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_AUTHOR("Oliver Hartkopp <oliver.hartkopp@volkswagen.de>");
 
+#ifdef CONFIG_CAN_DEBUG_CORE
+static int debug = 0;
+module_param(debug, int, S_IRUGO);
+MODULE_PARM_DESC(debug, "debug print mask: 1:debug, 2:frames, 4:skbs");
+#endif
+
 #define GET_U64(p) (*(u64*)(p)->data) /* easy access */
 
 struct bcm_op {

diff --git a/kernel/2.6/net/can/raw.c b/kernel/2.6/net/can/raw.c
index afcd41e67ae0636a5b1a0121b0fdc30763abebf2..e1141d6b4378a39449a27787086f037136a5a75e 100644 (file)
--- a/kernel/2.6/net/can/raw.c
+++ b/kernel/2.6/net/can/raw.c
@@ -71,13 +71,7 @@ MODULE_AUTHOR("Urs Thuermann <urs.thuermann@volkswagen.de>");
 #ifdef CONFIG_CAN_DEBUG_CORE
 static int debug = 0;
 module_param(debug, int, S_IRUGO);
-#define DBG(args...)       (debug & 1 ? \
-                              (printk(KERN_DEBUG "RAW %s: ", __func__), \
-                               printk(args)) : 0)
-#define DBG_SKB(skb)       (debug & 4 ? can_debug_skb(skb) : 0)
-#else
-#define DBG(args...)
-#define DBG_SKB(skb)
+MODULE_PARM_DESC(debug, "debug print mask: 1:debug, 2:frames, 4:skbs");
 #endif
 
 static int raw_init(struct sock *sk);