From 94953223c17032bdb5ac5acaab56f724142f054f Mon Sep 17 00:00:00 2001 From: hartkopp Date: Wed, 21 Feb 2007 13:39:52 +0000 Subject: [PATCH] Changed banner strings. git-svn-id: svn://svn.berlios.de//socketcan/trunk@154 030b6a49-0b11-0410-94ab-b0dab22257f2 --- kernel/2.4/can/af_can.c | 5 ++--- kernel/2.4/can/bcm.c | 6 +++--- kernel/2.4/can/raw.c | 5 ++--- kernel/2.4/can/vcan.c | 6 ++---- kernel/2.4/can/version.h | 1 - kernel/2.6/drivers/net/can/vcan.c | 6 ++---- kernel/2.6/include/linux/can/version.h | 1 - kernel/2.6/net/can/af_can.c | 5 ++--- kernel/2.6/net/can/bcm.c | 6 +++--- kernel/2.6/net/can/raw.c | 5 ++--- 10 files changed, 18 insertions(+), 28 deletions(-) diff --git a/kernel/2.4/can/af_can.c b/kernel/2.4/can/af_can.c index ac46b41..a9d246e 100644 --- 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 , " "Oliver Hartkopp "); diff --git a/kernel/2.4/can/bcm.c b/kernel/2.4/can/bcm.c index 191f435..73872ca 100644 --- 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 "); diff --git a/kernel/2.4/can/raw.c b/kernel/2.4/can/raw.c index 2033ac6..f58bfed 100644 --- 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 "); diff --git a/kernel/2.4/can/vcan.c b/kernel/2.4/can/vcan.c index dea4aed..38f2873 100644 --- 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 "); diff --git a/kernel/2.4/can/version.h b/kernel/2.4/can/version.h index 1985ce4..6478010 100644 --- 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 03fa23c..efa5fac 100644 --- 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 "); diff --git a/kernel/2.6/include/linux/can/version.h b/kernel/2.6/include/linux/can/version.h index 1926c29..b310cbb 100644 --- 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 a93028e..1a451cd 100644 --- 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 , " "Oliver Hartkopp "); diff --git a/kernel/2.6/net/can/bcm.c b/kernel/2.6/net/can/bcm.c index ec2d655..274ff3c 100644 --- 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 "); diff --git a/kernel/2.6/net/can/raw.c b/kernel/2.6/net/can/raw.c index 50a4d29..25007dc 100644 --- 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 "); -- 2.39.2