aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2001-11-06 05:25:50 (GMT)
committerJouni Malinen <j@w1.fi>2001-11-06 05:25:50 (GMT)
commit05ba7e6190016fe9f2e4634cc6b0ce5bbfe950a5 (patch)
tree9711bb5bf3e3759d8e2550aa3d798c879f348181
parenta23ee13041491178d2da364eec50725a731b7119 (diff)
downloadhostap-history-05ba7e6190016fe9f2e4634cc6b0ce5bbfe950a5.zip
hostap-history-05ba7e6190016fe9f2e4634cc6b0ce5bbfe950a5.tar.gz
hostap-history-05ba7e6190016fe9f2e4634cc6b0ce5bbfe950a5.tar.bz2
Code cleanup and small fixes, etc.prism2_gpl_2001_11_05
-rw-r--r--driver/modules/prism2.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/driver/modules/prism2.c b/driver/modules/prism2.c
index 0eb7d48..2b40e1b 100644
--- a/driver/modules/prism2.c
+++ b/driver/modules/prism2.c
@@ -71,7 +71,7 @@
#include <linux/module.h>
#include <linux/init.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
#include <pcmcia/version.h>
#include <pcmcia/cs_types.h>
@@ -114,7 +114,7 @@ static struct semaphore rtnl_sem = MUTEX;
static char *version =
-"prism2.c 0.0.0 2001-09-27 (SSH Communications Security Corp, Jouni Malinen)";
+"prism2.c 0.0.0 2001-11-05 (SSH Communications Security Corp, Jouni Malinen)";
static dev_info_t dev_info = "prism2";
static dev_link_t *dev_list = NULL;
static struct proc_dir_entry *prism2_proc = NULL;
@@ -290,7 +290,6 @@ static int hfa384x_cmd(struct net_device *dev, u16 cmd, u16 param0,
}
-/* Offset must be even */
int hfa384x_setup_bap(struct net_device *dev, u16 bap, u16 id, int offset)
{
u16 o_off, tmp;
@@ -981,7 +980,7 @@ int prism2_transmit(struct net_device *dev, int idx)
if (res) {
spin_unlock_irqrestore(&local->txfidlock, flags);
printk("%s: prism2_transmit: CMDCODE_TRANSMIT failed "
- "(res=0x%04x)\n", dev->name, res);
+ "(res=%d, resp0=0x%04x)\n", dev->name, res, resp0);
local->stats.tx_dropped++;
return 1;
}
@@ -1571,7 +1570,7 @@ static void prism2_rx(struct net_device *dev)
atomic_inc(&sta->users);
spin_unlock(&local->ap->sta_table_lock);
if (sta == NULL || !(sta->flags & WLAN_STA_ASSOC)) {
- printk("%s: dropped received packet from "
+ printk(KERN_DEBUG "%s: dropped received packet from "
"non-associated STA " MACSTR " (type=0x%02x, "
"subtype=0x%02x)\n", dev->name,
MAC2STR(rxdesc.addr2), type, stype);
@@ -1588,8 +1587,8 @@ static void prism2_rx(struct net_device *dev)
* above?
* with current code, STAs do not survive AP reset
* every time */
- printk("%s: dropped received packet from " MACSTR
- " with no ToDS flag (type=0x%02x, "
+ printk(KERN_DEBUG "%s: dropped received packet from "
+ MACSTR " with no ToDS flag (type=0x%02x, "
"subtype=0x%02x)\n", dev->name,
MAC2STR(rxdesc.addr2), type, stype);
prism2_dump_rx_header(dev->name, &rxdesc);
@@ -3486,7 +3485,8 @@ static void prism2_info(struct net_device *dev)
if (left > 0) {
unsigned char *c = (unsigned char *) scanres;
- PDEBUG(DEBUG_EXTRA, "ScanRes extra: left=%d (expected %dx):", left,
+ PDEBUG(DEBUG_EXTRA, "ScanRes extra: left=%d "
+ "(expected %dx):", left,
sizeof(struct hfa384x_scan_result));
for (i = 0; i < left; i++)
PDEBUG2(DEBUG_EXTRA, " %02x", *c++);