From f06ac319c05c6822f878f201ae80e54fbbe8be8c Mon Sep 17 00:00:00 2001
From: Jouni Malinen <jkmaline@cc.hut.fi>
Date: Sat, 30 Jul 2005 12:50:00 -0700
Subject: [PATCH] [PATCH] hostap update
Add MODULE_VERSION information for the Host AP kernel modules and
update the version string to indicate which version of the external
Host AP driver is included in the kernel tree.
Signed-off-by: Jouni Malinen <jkmaline@cc.hut.fi>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
---
drivers/net/wireless/hostap/hostap.c | 1 +
drivers/net/wireless/hostap/hostap_config.h | 2 +-
drivers/net/wireless/hostap/hostap_crypt_ccmp.c | 1 +
drivers/net/wireless/hostap/hostap_crypt_tkip.c | 1 +
drivers/net/wireless/hostap/hostap_crypt_wep.c | 2 ++
drivers/net/wireless/hostap/hostap_cs.c | 1 +
drivers/net/wireless/hostap/hostap_pci.c | 1 +
drivers/net/wireless/hostap/hostap_plx.c | 1 +
8 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/hostap/hostap.c b/drivers/net/wireless/hostap/hostap.c
index ea30ba806050..182891f1dd02 100644
--- a/drivers/net/wireless/hostap/hostap.c
+++ b/drivers/net/wireless/hostap/hostap.c
@@ -37,6 +37,7 @@
MODULE_AUTHOR("Jouni Malinen");
MODULE_DESCRIPTION("Host AP common routines");
MODULE_LICENSE("GPL");
+MODULE_VERSION(PRISM2_VERSION);
/* Old hostap_crypt module is now part of hostap module. */
#include "hostap_crypt.c"
diff --git a/drivers/net/wireless/hostap/hostap_config.h b/drivers/net/wireless/hostap/hostap_config.h
index fcf45781f4ad..0b526febd1a8 100644
--- a/drivers/net/wireless/hostap/hostap_config.h
+++ b/drivers/net/wireless/hostap/hostap_config.h
@@ -1,7 +1,7 @@
#ifndef HOSTAP_CONFIG_H
#define HOSTAP_CONFIG_H
-#define PRISM2_VERSION "CVS"
+#define PRISM2_VERSION "0.4.1-kernel"
/* In the previous versions of Host AP driver, support for user space version
* of IEEE 802.11 management (hostapd) used to be disabled in the default
diff --git a/drivers/net/wireless/hostap/hostap_crypt_ccmp.c b/drivers/net/wireless/hostap/hostap_crypt_ccmp.c
index e95bcc73dbf1..ad26aac2d5fe 100644
--- a/drivers/net/wireless/hostap/hostap_crypt_ccmp.c
+++ b/drivers/net/wireless/hostap/hostap_crypt_ccmp.c
@@ -36,6 +36,7 @@
MODULE_AUTHOR("Jouni Malinen");
MODULE_DESCRIPTION("Host AP crypt: CCMP");
MODULE_LICENSE("GPL");
+MODULE_VERSION(PRISM2_VERSION);
#define AES_BLOCK_LEN 16
diff --git a/drivers/net/wireless/hostap/hostap_crypt_tkip.c b/drivers/net/wireless/hostap/hostap_crypt_tkip.c
index e8d56bc280aa..fcf1a014f4ac 100644
--- a/drivers/net/wireless/hostap/hostap_crypt_tkip.c
+++ b/drivers/net/wireless/hostap/hostap_crypt_tkip.c
@@ -38,6 +38,7 @@
MODULE_AUTHOR("Jouni Malinen");
MODULE_DESCRIPTION("Host AP crypt: TKIP");
MODULE_LICENSE("GPL");
+MODULE_VERSION(PRISM2_VERSION);
struct hostap_tkip_data {
diff --git a/drivers/net/wireless/hostap/hostap_crypt_wep.c b/drivers/net/wireless/hostap/hostap_crypt_wep.c
index a6783e067f1a..66c403f17631 100644
--- a/drivers/net/wireless/hostap/hostap_crypt_wep.c
+++ b/drivers/net/wireless/hostap/hostap_crypt_wep.c
@@ -19,6 +19,7 @@
#include <asm/string.h>
#include "hostap_crypt.h"
+#include "hostap_config.h"
#ifndef CONFIG_CRYPTO
#error CONFIG_CRYPTO is required to build this module.
@@ -30,6 +31,7 @@
MODULE_AUTHOR("Jouni Malinen");
MODULE_DESCRIPTION("Host AP crypt: WEP");
MODULE_LICENSE("GPL");
+MODULE_VERSION(PRISM2_VERSION);
struct prism2_wep_data {
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index 36b80ce137bd..a5a6d6a966ee 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -32,6 +32,7 @@ MODULE_DESCRIPTION("Support for Intersil Prism2-based 802.11 wireless LAN "
"cards (PC Card).");
MODULE_SUPPORTED_DEVICE("Intersil Prism2-based WLAN cards (PC Card)");
MODULE_LICENSE("GPL");
+MODULE_VERSION(PRISM2_VERSION);
static int ignore_cis_vcc;
diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c
index c4c7b2f2e8ac..786c146f533e 100644
--- a/drivers/net/wireless/hostap/hostap_pci.c
+++ b/drivers/net/wireless/hostap/hostap_pci.c
@@ -31,6 +31,7 @@ MODULE_DESCRIPTION("Support for Intersil Prism2.5-based 802.11 wireless LAN "
"PCI cards.");
MODULE_SUPPORTED_DEVICE("Intersil Prism2.5-based WLAN PCI cards");
MODULE_LICENSE("GPL");
+MODULE_VERSION(PRISM2_VERSION);
/* FIX: do we need mb/wmb/rmb with memory operations? */
diff --git a/drivers/net/wireless/hostap/hostap_plx.c b/drivers/net/wireless/hostap/hostap_plx.c
index e29ac2271bd2..c2f5b1f2b857 100644
--- a/drivers/net/wireless/hostap/hostap_plx.c
+++ b/drivers/net/wireless/hostap/hostap_plx.c
@@ -34,6 +34,7 @@ MODULE_DESCRIPTION("Support for Intersil Prism2-based 802.11 wireless LAN "
"cards (PLX).");
MODULE_SUPPORTED_DEVICE("Intersil Prism2-based WLAN cards (PLX)");
MODULE_LICENSE("GPL");
+MODULE_VERSION(PRISM2_VERSION);
static int ignore_cis;