Changed banner strings.

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

diff --git a/kernel/2.4/can/af_can.c b/kernel/2.4/can/af_can.c
index ac46b416a657583edc6d330b229cdd617753dc1f..a9d246ef04169f54c1e7c38c87225d84263d34ee 100644 (file)
--- a/kernel/2.4/can/af_can.c
+++ b/kernel/2.4/can/af_can.c
@@ -63,11 +63,10 @@
 
 RCSID("$Id$");
 
-#define NAME "Volkswagen AG - Low Level CAN Framework (LLCF)"
 #define IDENT "af_can"
-static __initdata const char banner[] = BANNER(NAME);
+static __initdata const char banner[] = KERN_INFO "CAN: PF_CAN core " VERSION "\n"; 
 
-MODULE_DESCRIPTION(NAME);
+MODULE_DESCRIPTION("PF_CAN core");
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_AUTHOR("Urs Thuermann <urs.thuermann@volkswagen.de>, "
              "Oliver Hartkopp <oliver.hartkopp@volkswagen.de>");

diff --git a/kernel/2.4/can/bcm.c b/kernel/2.4/can/bcm.c
index 191f4351ab8ee5471ed4ee5d369e5f61977a6243..73872ca46c407f73fa26da4052813145c9ef071f 100644 (file)
--- a/kernel/2.4/can/bcm.c
+++ b/kernel/2.4/can/bcm.c
@@ -76,11 +76,11 @@ static int debug = 0;
 #define BCM_CAN_DLC_MASK 0x0F /* clean flags by masking with BCM_CAN_DLC_MASK */
 #define BCM_RX_REGMASK (CAN_EFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG)
 
-#define NAME "Broadcast Manager (BCM) for LLCF"
 #define IDENT "bcm"
-static __initdata const char banner[] = BANNER(NAME);
+static __initdata const char banner[] =
+       KERN_INFO "CAN: broadcast manager (bcm) socket protocol " VERSION "\n"; 
 
-MODULE_DESCRIPTION(NAME);
+MODULE_DESCRIPTION("PF_CAN bcm sockets");
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_AUTHOR("Oliver Hartkopp <oliver.hartkopp@volkswagen.de>");
 

diff --git a/kernel/2.4/can/raw.c b/kernel/2.4/can/raw.c
index 2033ac696ed0866a886a7cfdd26733c19cc06c81..f58bfede35267795cb46c7e006c1ca187f2f6908 100644 (file)
--- a/kernel/2.4/can/raw.c
+++ b/kernel/2.4/can/raw.c
@@ -58,11 +58,10 @@
 RCSID("$Id$");
 
 
-#define NAME "RAW sockets for LLCF"
 #define IDENT "raw"
-static __initdata const char banner[] = BANNER(NAME);
+static __initdata const char banner[] = KERN_INFO "CAN: raw socket protocol " VERSION "\n"; 
 
-MODULE_DESCRIPTION(NAME);
+MODULE_DESCRIPTION("PF_CAN raw sockets");
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_AUTHOR("Urs Thuermann <urs.thuermann@volkswagen.de>");
 

diff --git a/kernel/2.4/can/vcan.c b/kernel/2.4/can/vcan.c
index dea4aedcb31c2a3130a51ec21ec8daa5de99e8a8..38f2873a56ba1d0650be3118594de27db80a1979 100644 (file)
--- a/kernel/2.4/can/vcan.c
+++ b/kernel/2.4/can/vcan.c
@@ -52,11 +52,9 @@
 
 RCSID("$Id$");
 
+static __initdata const char banner[] = KERN_INFO "CAN: virtual CAN interface " VERSION "\n"; 
 
-#define NAME "VCAN loopback interface for LLCF"
-static __initdata const char banner[] = BANNER(NAME);
-
-MODULE_DESCRIPTION(NAME);
+MODULE_DESCRIPTION("virtual CAN interface");
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_AUTHOR("Urs Thuermann <urs.thuermann@volkswagen.de>");
 

diff --git a/kernel/2.4/can/version.h b/kernel/2.4/can/version.h
index 1985ce4f0ea21d9f01eda76cee8b06074c13064c..64780108abf02b0e356d8190f2f00fe8573b4bfc 100644 (file)
--- a/kernel/2.4/can/version.h
+++ b/kernel/2.4/can/version.h
@@ -67,6 +67,5 @@ RCSID("$Id$");
 
 #define VERSION str(MAJORVERSION) "." str(MINORVERSION) "." str(PATCHLEVEL) \
        EXTRAVERSION
-#define BANNER(name) KERN_INFO name " v" VERSION "\n"
 
 #endif /* VERSION_H */

diff --git a/kernel/2.6/drivers/net/can/vcan.c b/kernel/2.6/drivers/net/can/vcan.c
index 03fa23c429d65ead3289fe240dac91d2d5f3c8e9..efa5fac736276c25d2a9e7c1f7ff414eebd9b2ca 100644 (file)
--- a/kernel/2.6/drivers/net/can/vcan.c
+++ b/kernel/2.6/drivers/net/can/vcan.c
@@ -53,11 +53,9 @@
 
 RCSID("$Id$");
 
+static __initdata const char banner[] = KERN_INFO "CAN: virtual CAN interface " VERSION "\n"; 
 
-#define NAME "VCAN loopback interface for LLCF"
-static __initdata const char banner[] = BANNER(NAME);
-
-MODULE_DESCRIPTION(NAME);
+MODULE_DESCRIPTION("virtual CAN interface");
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_AUTHOR("Urs Thuermann <urs.thuermann@volkswagen.de>");
 

diff --git a/kernel/2.6/include/linux/can/version.h b/kernel/2.6/include/linux/can/version.h
index 1926c29a5e157af0a29988335db88011a4aa3cdc..b310cbb69615b5a4e567e55509f81b6fb6a5ed56 100644 (file)
--- a/kernel/2.6/include/linux/can/version.h
+++ b/kernel/2.6/include/linux/can/version.h
@@ -67,6 +67,5 @@ RCSID("$Id$");
 
 #define VERSION str(MAJORVERSION) "." str(MINORVERSION) "." str(PATCHLEVEL) \
        EXTRAVERSION
-#define BANNER(name) KERN_INFO name " v" VERSION "\n"
 
 #endif /* CAN_VERSION_H */

diff --git a/kernel/2.6/net/can/af_can.c b/kernel/2.6/net/can/af_can.c
index a93028e8e48bb6778e35669796754eb1bfb28a5b..1a451cd9fa2492431cdf2366f966069d03a3e102 100644 (file)
--- a/kernel/2.6/net/can/af_can.c
+++ b/kernel/2.6/net/can/af_can.c
@@ -66,11 +66,10 @@
 
 RCSID("$Id$");
 
-#define NAME "Volkswagen AG - Low Level CAN Framework (LLCF)"
 #define IDENT "af_can"
-static __initdata const char banner[] = BANNER(NAME);
+static __initdata const char banner[] = KERN_INFO "CAN: PF_CAN core " VERSION "\n"; 
 
-MODULE_DESCRIPTION(NAME);
+MODULE_DESCRIPTION("PF_CAN core");
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_AUTHOR("Urs Thuermann <urs.thuermann@volkswagen.de>, "
              "Oliver Hartkopp <oliver.hartkopp@volkswagen.de>");

diff --git a/kernel/2.6/net/can/bcm.c b/kernel/2.6/net/can/bcm.c
index ec2d6553d2e9b57d0a81de92ee4dafeaaf133cde..274ff3c8edabada7741ea53dfc45010f1bf9f2b7 100644 (file)
--- a/kernel/2.6/net/can/bcm.c
+++ b/kernel/2.6/net/can/bcm.c
@@ -79,11 +79,11 @@ module_param(debug, int, S_IRUGO);
 #define BCM_CAN_DLC_MASK 0x0F /* clean flags by masking with BCM_CAN_DLC_MASK */
 #define BCM_RX_REGMASK (CAN_EFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG)
 
-#define NAME "Broadcast Manager (BCM) for LLCF"
 #define IDENT "bcm"
-static __initdata const char banner[] = BANNER(NAME);
+static __initdata const char banner[] =
+       KERN_INFO "CAN: broadcast manager (bcm) socket protocol " VERSION "\n"; 
 
-MODULE_DESCRIPTION(NAME);
+MODULE_DESCRIPTION("PF_CAN bcm sockets");
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_AUTHOR("Oliver Hartkopp <oliver.hartkopp@volkswagen.de>");
 

diff --git a/kernel/2.6/net/can/raw.c b/kernel/2.6/net/can/raw.c
index 50a4d29503afa475a71820d6d8878a03dd609208..25007dcd2a559255e2e00747e66d169cc9d4373f 100644 (file)
--- a/kernel/2.6/net/can/raw.c
+++ b/kernel/2.6/net/can/raw.c
@@ -62,11 +62,10 @@
 
 RCSID("$Id$");
 
-#define NAME "RAW sockets for LLCF"
 #define IDENT "raw"
-static __initdata const char banner[] = BANNER(NAME);
+static __initdata const char banner[] = KERN_INFO "CAN: raw socket protocol " VERSION "\n"; 
 
-MODULE_DESCRIPTION(NAME);
+MODULE_DESCRIPTION("PF_CAN raw sockets");
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_AUTHOR("Urs Thuermann <urs.thuermann@volkswagen.de>");