git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
net
/
wireless
/
wavelan_cs.p.h
diff --git
a/drivers/net/wireless/wavelan_cs.p.h
b/drivers/net/wireless/wavelan_cs.p.h
index
f7dfc2f
..
ea2ef8d
100644
(file)
--- a/
drivers/net/wireless/wavelan_cs.p.h
+++ b/
drivers/net/wireless/wavelan_cs.p.h
@@
-428,10
+428,10
@@
#include <linux/spinlock.h>
#include <linux/in.h>
#include <linux/delay.h>
#include <linux/spinlock.h>
#include <linux/in.h>
#include <linux/delay.h>
+#include <linux/bitops.h>
#include <asm/uaccess.h>
#include <asm/io.h>
#include <asm/system.h>
#include <asm/uaccess.h>
#include <asm/io.h>
#include <asm/system.h>
-#include <asm/bitops.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
@@
-629,6
+629,7
@@
struct net_local
iw_stats wstats; /* Wireless specific stats */
struct iw_spy_data spy_data;
iw_stats wstats; /* Wireless specific stats */
struct iw_spy_data spy_data;
+ struct iw_public_data wireless_data;
#endif
#ifdef HISTOGRAM
#endif
#ifdef HISTOGRAM
@@
-644,6
+645,7
@@
struct net_local
int cell_search; /* Searching for new cell? */
struct timer_list cell_timer; /* Garbage collection */
#endif /* WAVELAN_ROAMING */
int cell_search; /* Searching for new cell? */
struct timer_list cell_timer; /* Garbage collection */
#endif /* WAVELAN_ROAMING */
+ void __iomem *mem;
};
/**************************** PROTOTYPES ****************************/
};
/**************************** PROTOTYPES ****************************/
@@
-725,6
+727,8
@@
static inline void
/* ------------------- IOCTL, STATS & RECONFIG ------------------- */
static en_stats *
wavelan_get_stats(struct net_device *); /* Give stats /proc/net/dev */
/* ------------------- IOCTL, STATS & RECONFIG ------------------- */
static en_stats *
wavelan_get_stats(struct net_device *); /* Give stats /proc/net/dev */
+static iw_stats *
+ wavelan_get_wireless_stats(struct net_device *);
/* ----------------------- PACKET RECEPTION ----------------------- */
static inline int
wv_start_of_frame(struct net_device *, /* Seek beggining of current frame */
/* ----------------------- PACKET RECEPTION ----------------------- */
static inline int
wv_start_of_frame(struct net_device *, /* Seek beggining of current frame */
@@
-791,23
+795,16
@@
static dev_link_t *dev_list = NULL; /* Linked list of devices */
* The exact syntax is 'insmod wavelan_cs.o <var>=<value>'
*/
* The exact syntax is 'insmod wavelan_cs.o <var>=<value>'
*/
-/* Bit map of interrupts to choose from */
-/* This means pick from 15, 14, 12, 11, 10, 9, 7, 5, 4 and 3 */
-static int irq_mask = 0xdeb8;
-static int irq_list[4] = { -1 };
-
/* Shared memory speed, in ns */
static int mem_speed = 0;
/* New module interface */
/* Shared memory speed, in ns */
static int mem_speed = 0;
/* New module interface */
-MODULE_PARM(irq_mask, "i");
-MODULE_PARM(irq_list, "1-4i");
-MODULE_PARM(mem_speed, "i");
+module_param(mem_speed, int, 0);
#ifdef WAVELAN_ROAMING /* Conditional compile, see above in options */
/* Enable roaming mode ? No ! Please keep this to 0 */
static int do_roaming = 0;
#ifdef WAVELAN_ROAMING /* Conditional compile, see above in options */
/* Enable roaming mode ? No ! Please keep this to 0 */
static int do_roaming = 0;
-
MODULE_PARM(do_roaming, "i"
);
+
module_param(do_roaming, bool, 0
);
#endif /* WAVELAN_ROAMING */
MODULE_LICENSE("GPL");
#endif /* WAVELAN_ROAMING */
MODULE_LICENSE("GPL");