Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 58350
b: refs/heads/master
c: bd5824f
h: refs/heads/master
v: v3
  • Loading branch information
Jouni Malinen authored and Jeff Garzik committed Jul 9, 2007
1 parent 456d92b commit 9ba6c95
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 20 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c15057313725942c6af8dcb60b4d4322101316d9
refs/heads/master: bd5824f138153f407e300728919e814ab7dcfadb
2 changes: 0 additions & 2 deletions trunk/drivers/net/wireless/hostap/hostap_config.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#ifndef HOSTAP_CONFIG_H
#define HOSTAP_CONFIG_H

#define PRISM2_VERSION "0.4.4-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
* configuration. From now on, support for hostapd is always included and it is
Expand Down
4 changes: 0 additions & 4 deletions trunk/drivers/net/wireless/hostap/hostap_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,13 @@
#include "hostap_wlan.h"


static char *version = PRISM2_VERSION " (Jouni Malinen <j@w1.fi>)";
static dev_info_t dev_info = "hostap_cs";

MODULE_AUTHOR("Jouni Malinen");
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;
Expand Down Expand Up @@ -910,14 +908,12 @@ static struct pcmcia_driver hostap_driver = {

static int __init init_prism2_pccard(void)
{
printk(KERN_INFO "%s: %s\n", dev_info, version);
return pcmcia_register_driver(&hostap_driver);
}

static void __exit exit_prism2_pccard(void)
{
pcmcia_unregister_driver(&hostap_driver);
printk(KERN_INFO "%s: Driver unloaded\n", dev_info);
}


Expand Down
2 changes: 0 additions & 2 deletions trunk/drivers/net/wireless/hostap/hostap_ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -3893,8 +3893,6 @@ static void prism2_get_drvinfo(struct net_device *dev,
local = iface->local;

strncpy(info->driver, "hostap", sizeof(info->driver) - 1);
strncpy(info->version, PRISM2_VERSION,
sizeof(info->version) - 1);
snprintf(info->fw_version, sizeof(info->fw_version) - 1,
"%d.%d.%d", (local->sta_fw_ver >> 16) & 0xff,
(local->sta_fw_ver >> 8) & 0xff,
Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/net/wireless/hostap/hostap_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
MODULE_AUTHOR("Jouni Malinen");
MODULE_DESCRIPTION("Host AP common routines");
MODULE_LICENSE("GPL");
MODULE_VERSION(PRISM2_VERSION);

#define TX_TIMEOUT (2 * HZ)

Expand Down
5 changes: 0 additions & 5 deletions trunk/drivers/net/wireless/hostap/hostap_pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
#include "hostap_wlan.h"


static char *version = PRISM2_VERSION " (Jouni Malinen <j@w1.fi>)";
static char *dev_info = "hostap_pci";


Expand All @@ -29,7 +28,6 @@ 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);


/* struct local_info::hw_priv */
Expand Down Expand Up @@ -462,16 +460,13 @@ static struct pci_driver prism2_pci_drv_id = {

static int __init init_prism2_pci(void)
{
printk(KERN_INFO "%s: %s\n", dev_info, version);

return pci_register_driver(&prism2_pci_drv_id);
}


static void __exit exit_prism2_pci(void)
{
pci_unregister_driver(&prism2_pci_drv_id);
printk(KERN_INFO "%s: Driver unloaded\n", dev_info);
}


Expand Down
5 changes: 0 additions & 5 deletions trunk/drivers/net/wireless/hostap/hostap_plx.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include "hostap_wlan.h"


static char *version = PRISM2_VERSION " (Jouni Malinen <j@w1.fi>)";
static char *dev_info = "hostap_plx";


Expand All @@ -32,7 +31,6 @@ 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;
Expand Down Expand Up @@ -623,16 +621,13 @@ static struct pci_driver prism2_plx_drv_id = {

static int __init init_prism2_plx(void)
{
printk(KERN_INFO "%s: %s\n", dev_info, version);

return pci_register_driver(&prism2_plx_drv_id);
}


static void __exit exit_prism2_plx(void)
{
pci_unregister_driver(&prism2_plx_drv_id);
printk(KERN_INFO "%s: Driver unloaded\n", dev_info);
}


Expand Down

0 comments on commit 9ba6c95

Please sign in to comment.