From 248af6249a9b55d1331239f9a00b9c0ea59537cb Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Sat, 19 Jun 2010 11:12:35 +0200 Subject: [PATCH] Version is shown on module load. --- Makefile | 5 +++-- cryptodev_main.c | 11 ++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 83a940c..fd71f0b 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,13 @@ KERNEL_DIR = /lib/modules/$(shell uname -r)/build -VERSION = 0.2 +VERSION = 0.3 cryptodev-objs = cryptodev_main.o cryptodev_cipher.o obj-m += cryptodev.o build: - make -C $(KERNEL_DIR) SUBDIRS=`pwd` modules + @echo "#define VERSION \"$(VERSION)\"" > version.h + make -C $(KERNEL_DIR) VERSION="$VERSION" SUBDIRS=`pwd` modules install: make -C $(KERNEL_DIR) SUBDIRS=`pwd` modules_install diff --git a/cryptodev_main.c b/cryptodev_main.c index 9d405e8..9d1e5f7 100644 --- a/cryptodev_main.c +++ b/cryptodev_main.c @@ -39,6 +39,7 @@ #include #include #include "cryptodev_int.h" +#include "version.h" MODULE_AUTHOR("Nikos Mavrogiannopoulos "); MODULE_DESCRIPTION("CryptoDev driver"); @@ -197,7 +198,7 @@ crypto_create_session(struct fcrypt *fcr, struct session_op *sop) dprintk(1,KERN_DEBUG,"%s: Failed to load cipher for %s\n", __func__, alg_name); ret = -EINVAL; - goto error; + goto error_cipher; } } @@ -207,7 +208,7 @@ crypto_create_session(struct fcrypt *fcr, struct session_op *sop) dprintk(1,KERN_DEBUG,"%s: Failed to load hash for %s\n", __func__, hash_name); ret = -EINVAL; - goto error; + goto error_hash; } } @@ -235,9 +236,9 @@ restart: return 0; -error: +error_hash: cryptodev_cipher_deinit( &ses_new->cdata); - cryptodev_hash_deinit( &ses_new->hdata); +error_cipher: if (ses_new) kfree(ses_new); return ret; @@ -752,7 +753,7 @@ int __init init_cryptodev(void) if (unlikely(rc)) return rc; - printk(KERN_INFO PFX "driver loaded.\n"); + printk(KERN_INFO PFX "driver %s loaded.\n", VERSION); return 0; } -- 2.11.4.GIT