diff options
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/hostap/hostap_config.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/hostap/hostap_cs.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/hostap/hostap_ioctl.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/hostap/hostap_main.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/hostap/hostap_pci.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/hostap/hostap_plx.c | 5 |
6 files changed, 0 insertions, 19 deletions
diff --git a/drivers/net/wireless/hostap/hostap_config.h b/drivers/net/wireless/hostap/hostap_config.h index c090a5aebb58..30acd39d76a2 100644 --- a/drivers/net/wireless/hostap/hostap_config.h +++ b/drivers/net/wireless/hostap/hostap_config.h | |||
@@ -1,8 +1,6 @@ | |||
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 "0.4.4-kernel" | ||
5 | |||
6 | /* In the previous versions of Host AP driver, support for user space version | 4 | /* 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 | 5 | * of IEEE 802.11 management (hostapd) used to be disabled in the default |
8 | * configuration. From now on, support for hostapd is always included and it is | 6 | * configuration. From now on, support for hostapd is always included and it is |
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c index ee1532b62e42..30e723f65979 100644 --- a/drivers/net/wireless/hostap/hostap_cs.c +++ b/drivers/net/wireless/hostap/hostap_cs.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include "hostap_wlan.h" | 22 | #include "hostap_wlan.h" |
23 | 23 | ||
24 | 24 | ||
25 | static char *version = PRISM2_VERSION " (Jouni Malinen <j@w1.fi>)"; | ||
26 | static dev_info_t dev_info = "hostap_cs"; | 25 | static dev_info_t dev_info = "hostap_cs"; |
27 | 26 | ||
28 | MODULE_AUTHOR("Jouni Malinen"); | 27 | MODULE_AUTHOR("Jouni Malinen"); |
@@ -30,7 +29,6 @@ MODULE_DESCRIPTION("Support for Intersil Prism2-based 802.11 wireless LAN " | |||
30 | "cards (PC Card)."); | 29 | "cards (PC Card)."); |
31 | MODULE_SUPPORTED_DEVICE("Intersil Prism2-based WLAN cards (PC Card)"); | 30 | MODULE_SUPPORTED_DEVICE("Intersil Prism2-based WLAN cards (PC Card)"); |
32 | MODULE_LICENSE("GPL"); | 31 | MODULE_LICENSE("GPL"); |
33 | MODULE_VERSION(PRISM2_VERSION); | ||
34 | 32 | ||
35 | 33 | ||
36 | static int ignore_cis_vcc; | 34 | static int ignore_cis_vcc; |
@@ -910,14 +908,12 @@ static struct pcmcia_driver hostap_driver = { | |||
910 | 908 | ||
911 | static int __init init_prism2_pccard(void) | 909 | static int __init init_prism2_pccard(void) |
912 | { | 910 | { |
913 | printk(KERN_INFO "%s: %s\n", dev_info, version); | ||
914 | return pcmcia_register_driver(&hostap_driver); | 911 | return pcmcia_register_driver(&hostap_driver); |
915 | } | 912 | } |
916 | 913 | ||
917 | static void __exit exit_prism2_pccard(void) | 914 | static void __exit exit_prism2_pccard(void) |
918 | { | 915 | { |
919 | pcmcia_unregister_driver(&hostap_driver); | 916 | pcmcia_unregister_driver(&hostap_driver); |
920 | printk(KERN_INFO "%s: Driver unloaded\n", dev_info); | ||
921 | } | 917 | } |
922 | 918 | ||
923 | 919 | ||
diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c index cdea7f71b9eb..8c71077d653c 100644 --- a/drivers/net/wireless/hostap/hostap_ioctl.c +++ b/drivers/net/wireless/hostap/hostap_ioctl.c | |||
@@ -3893,8 +3893,6 @@ static void prism2_get_drvinfo(struct net_device *dev, | |||
3893 | local = iface->local; | 3893 | local = iface->local; |
3894 | 3894 | ||
3895 | strncpy(info->driver, "hostap", sizeof(info->driver) - 1); | 3895 | strncpy(info->driver, "hostap", sizeof(info->driver) - 1); |
3896 | strncpy(info->version, PRISM2_VERSION, | ||
3897 | sizeof(info->version) - 1); | ||
3898 | snprintf(info->fw_version, sizeof(info->fw_version) - 1, | 3896 | snprintf(info->fw_version, sizeof(info->fw_version) - 1, |
3899 | "%d.%d.%d", (local->sta_fw_ver >> 16) & 0xff, | 3897 | "%d.%d.%d", (local->sta_fw_ver >> 16) & 0xff, |
3900 | (local->sta_fw_ver >> 8) & 0xff, | 3898 | (local->sta_fw_ver >> 8) & 0xff, |
diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c index 4743426cf6ad..446de51bab74 100644 --- a/drivers/net/wireless/hostap/hostap_main.c +++ b/drivers/net/wireless/hostap/hostap_main.c | |||
@@ -37,7 +37,6 @@ | |||
37 | MODULE_AUTHOR("Jouni Malinen"); | 37 | MODULE_AUTHOR("Jouni Malinen"); |
38 | MODULE_DESCRIPTION("Host AP common routines"); | 38 | MODULE_DESCRIPTION("Host AP common routines"); |
39 | MODULE_LICENSE("GPL"); | 39 | MODULE_LICENSE("GPL"); |
40 | MODULE_VERSION(PRISM2_VERSION); | ||
41 | 40 | ||
42 | #define TX_TIMEOUT (2 * HZ) | 41 | #define TX_TIMEOUT (2 * HZ) |
43 | 42 | ||
diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c index db4899ed4bb1..0cd48d151f5e 100644 --- a/drivers/net/wireless/hostap/hostap_pci.c +++ b/drivers/net/wireless/hostap/hostap_pci.c | |||
@@ -20,7 +20,6 @@ | |||
20 | #include "hostap_wlan.h" | 20 | #include "hostap_wlan.h" |
21 | 21 | ||
22 | 22 | ||
23 | static char *version = PRISM2_VERSION " (Jouni Malinen <j@w1.fi>)"; | ||
24 | static char *dev_info = "hostap_pci"; | 23 | static char *dev_info = "hostap_pci"; |
25 | 24 | ||
26 | 25 | ||
@@ -29,7 +28,6 @@ MODULE_DESCRIPTION("Support for Intersil Prism2.5-based 802.11 wireless LAN " | |||
29 | "PCI cards."); | 28 | "PCI cards."); |
30 | MODULE_SUPPORTED_DEVICE("Intersil Prism2.5-based WLAN PCI cards"); | 29 | MODULE_SUPPORTED_DEVICE("Intersil Prism2.5-based WLAN PCI cards"); |
31 | MODULE_LICENSE("GPL"); | 30 | MODULE_LICENSE("GPL"); |
32 | MODULE_VERSION(PRISM2_VERSION); | ||
33 | 31 | ||
34 | 32 | ||
35 | /* struct local_info::hw_priv */ | 33 | /* struct local_info::hw_priv */ |
@@ -462,8 +460,6 @@ static struct pci_driver prism2_pci_drv_id = { | |||
462 | 460 | ||
463 | static int __init init_prism2_pci(void) | 461 | static int __init init_prism2_pci(void) |
464 | { | 462 | { |
465 | printk(KERN_INFO "%s: %s\n", dev_info, version); | ||
466 | |||
467 | return pci_register_driver(&prism2_pci_drv_id); | 463 | return pci_register_driver(&prism2_pci_drv_id); |
468 | } | 464 | } |
469 | 465 | ||
@@ -471,7 +467,6 @@ static int __init init_prism2_pci(void) | |||
471 | static void __exit exit_prism2_pci(void) | 467 | static void __exit exit_prism2_pci(void) |
472 | { | 468 | { |
473 | pci_unregister_driver(&prism2_pci_drv_id); | 469 | pci_unregister_driver(&prism2_pci_drv_id); |
474 | printk(KERN_INFO "%s: Driver unloaded\n", dev_info); | ||
475 | } | 470 | } |
476 | 471 | ||
477 | 472 | ||
diff --git a/drivers/net/wireless/hostap/hostap_plx.c b/drivers/net/wireless/hostap/hostap_plx.c index f0fd5ecdb24d..0183df757b3e 100644 --- a/drivers/net/wireless/hostap/hostap_plx.c +++ b/drivers/net/wireless/hostap/hostap_plx.c | |||
@@ -23,7 +23,6 @@ | |||
23 | #include "hostap_wlan.h" | 23 | #include "hostap_wlan.h" |
24 | 24 | ||
25 | 25 | ||
26 | static char *version = PRISM2_VERSION " (Jouni Malinen <j@w1.fi>)"; | ||
27 | static char *dev_info = "hostap_plx"; | 26 | static char *dev_info = "hostap_plx"; |
28 | 27 | ||
29 | 28 | ||
@@ -32,7 +31,6 @@ MODULE_DESCRIPTION("Support for Intersil Prism2-based 802.11 wireless LAN " | |||
32 | "cards (PLX)."); | 31 | "cards (PLX)."); |
33 | MODULE_SUPPORTED_DEVICE("Intersil Prism2-based WLAN cards (PLX)"); | 32 | MODULE_SUPPORTED_DEVICE("Intersil Prism2-based WLAN cards (PLX)"); |
34 | MODULE_LICENSE("GPL"); | 33 | MODULE_LICENSE("GPL"); |
35 | MODULE_VERSION(PRISM2_VERSION); | ||
36 | 34 | ||
37 | 35 | ||
38 | static int ignore_cis; | 36 | static int ignore_cis; |
@@ -623,8 +621,6 @@ static struct pci_driver prism2_plx_drv_id = { | |||
623 | 621 | ||
624 | static int __init init_prism2_plx(void) | 622 | static int __init init_prism2_plx(void) |
625 | { | 623 | { |
626 | printk(KERN_INFO "%s: %s\n", dev_info, version); | ||
627 | |||
628 | return pci_register_driver(&prism2_plx_drv_id); | 624 | return pci_register_driver(&prism2_plx_drv_id); |
629 | } | 625 | } |
630 | 626 | ||
@@ -632,7 +628,6 @@ static int __init init_prism2_plx(void) | |||
632 | static void __exit exit_prism2_plx(void) | 628 | static void __exit exit_prism2_plx(void) |
633 | { | 629 | { |
634 | pci_unregister_driver(&prism2_plx_drv_id); | 630 | pci_unregister_driver(&prism2_plx_drv_id); |
635 | printk(KERN_INFO "%s: Driver unloaded\n", dev_info); | ||
636 | } | 631 | } |
637 | 632 | ||
638 | 633 | ||