aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/hostap/hostap.c1
-rw-r--r--drivers/net/wireless/hostap/hostap_config.h2
-rw-r--r--drivers/net/wireless/hostap/hostap_crypt_ccmp.c1
-rw-r--r--drivers/net/wireless/hostap/hostap_crypt_tkip.c1
-rw-r--r--drivers/net/wireless/hostap/hostap_crypt_wep.c2
-rw-r--r--drivers/net/wireless/hostap/hostap_cs.c1
-rw-r--r--drivers/net/wireless/hostap/hostap_pci.c1
-rw-r--r--drivers/net/wireless/hostap/hostap_plx.c1
8 files changed, 9 insertions, 1 deletions
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 @@
37MODULE_AUTHOR("Jouni Malinen"); 37MODULE_AUTHOR("Jouni Malinen");
38MODULE_DESCRIPTION("Host AP common routines"); 38MODULE_DESCRIPTION("Host AP common routines");
39MODULE_LICENSE("GPL"); 39MODULE_LICENSE("GPL");
40MODULE_VERSION(PRISM2_VERSION);
40 41
41/* Old hostap_crypt module is now part of hostap module. */ 42/* Old hostap_crypt module is now part of hostap module. */
42#include "hostap_crypt.c" 43#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 @@
1#ifndef HOSTAP_CONFIG_H 1#ifndef HOSTAP_CONFIG_H
2#define HOSTAP_CONFIG_H 2#define HOSTAP_CONFIG_H
3 3
4#define PRISM2_VERSION "CVS" 4#define PRISM2_VERSION "0.4.1-kernel"
5 5
6/* In the previous versions of Host AP driver, support for user space version 6/* In the previous versions of Host AP driver, support for user space version
7 * of IEEE 802.11 management (hostapd) used to be disabled in the default 7 * 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 @@
36MODULE_AUTHOR("Jouni Malinen"); 36MODULE_AUTHOR("Jouni Malinen");
37MODULE_DESCRIPTION("Host AP crypt: CCMP"); 37MODULE_DESCRIPTION("Host AP crypt: CCMP");
38MODULE_LICENSE("GPL"); 38MODULE_LICENSE("GPL");
39MODULE_VERSION(PRISM2_VERSION);
39 40
40 41
41#define AES_BLOCK_LEN 16 42#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 @@
38MODULE_AUTHOR("Jouni Malinen"); 38MODULE_AUTHOR("Jouni Malinen");
39MODULE_DESCRIPTION("Host AP crypt: TKIP"); 39MODULE_DESCRIPTION("Host AP crypt: TKIP");
40MODULE_LICENSE("GPL"); 40MODULE_LICENSE("GPL");
41MODULE_VERSION(PRISM2_VERSION);
41 42
42 43
43struct hostap_tkip_data { 44struct 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 @@
19#include <asm/string.h> 19#include <asm/string.h>
20 20
21#include "hostap_crypt.h" 21#include "hostap_crypt.h"
22#include "hostap_config.h"
22 23
23#ifndef CONFIG_CRYPTO 24#ifndef CONFIG_CRYPTO
24#error CONFIG_CRYPTO is required to build this module. 25#error CONFIG_CRYPTO is required to build this module.
@@ -30,6 +31,7 @@
30MODULE_AUTHOR("Jouni Malinen"); 31MODULE_AUTHOR("Jouni Malinen");
31MODULE_DESCRIPTION("Host AP crypt: WEP"); 32MODULE_DESCRIPTION("Host AP crypt: WEP");
32MODULE_LICENSE("GPL"); 33MODULE_LICENSE("GPL");
34MODULE_VERSION(PRISM2_VERSION);
33 35
34 36
35struct prism2_wep_data { 37struct 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 "
32 "cards (PC Card)."); 32 "cards (PC Card).");
33MODULE_SUPPORTED_DEVICE("Intersil Prism2-based WLAN cards (PC Card)"); 33MODULE_SUPPORTED_DEVICE("Intersil Prism2-based WLAN cards (PC Card)");
34MODULE_LICENSE("GPL"); 34MODULE_LICENSE("GPL");
35MODULE_VERSION(PRISM2_VERSION);
35 36
36 37
37static int ignore_cis_vcc; 38static 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 "
31 "PCI cards."); 31 "PCI cards.");
32MODULE_SUPPORTED_DEVICE("Intersil Prism2.5-based WLAN PCI cards"); 32MODULE_SUPPORTED_DEVICE("Intersil Prism2.5-based WLAN PCI cards");
33MODULE_LICENSE("GPL"); 33MODULE_LICENSE("GPL");
34MODULE_VERSION(PRISM2_VERSION);
34 35
35 36
36/* FIX: do we need mb/wmb/rmb with memory operations? */ 37/* 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 "
34 "cards (PLX)."); 34 "cards (PLX).");
35MODULE_SUPPORTED_DEVICE("Intersil Prism2-based WLAN cards (PLX)"); 35MODULE_SUPPORTED_DEVICE("Intersil Prism2-based WLAN cards (PLX)");
36MODULE_LICENSE("GPL"); 36MODULE_LICENSE("GPL");
37MODULE_VERSION(PRISM2_VERSION);
37 38
38 39
39static int ignore_cis; 40static int ignore_cis;