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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
net
/
wireless
/
ray_cs.h
diff --git
a/drivers/net/wireless/ray_cs.h
b/drivers/net/wireless/ray_cs.h
index
c77afa1
..
bd73ebf
100644
(file)
--- a/
drivers/net/wireless/ray_cs.h
+++ b/
drivers/net/wireless/ray_cs.h
@@
-31,7
+31,7
@@
typedef struct ray_dev_t {
void __iomem *sram; /* pointer to beginning of shared RAM */
void __iomem *amem; /* pointer to attribute mem window */
void __iomem *rmem; /* pointer to receive buffer window */
void __iomem *sram; /* pointer to beginning of shared RAM */
void __iomem *amem; /* pointer to attribute mem window */
void __iomem *rmem; /* pointer to receive buffer window */
-
dev_link_t *finder; /* pointer back to dev_link_t
for card */
+
struct pcmcia_device *finder; /* pointer back to struct pcmcia_device
for card */
struct timer_list timer;
long tx_ccs_lock;
long ccs_lock;
struct timer_list timer;
long tx_ccs_lock;
long ccs_lock;
@@
-63,13
+63,10
@@
typedef struct ray_dev_t {
UCHAR last_rsl;
int beacon_rxed;
struct beacon_rx last_bcn;
UCHAR last_rsl;
int beacon_rxed;
struct beacon_rx last_bcn;
-#ifdef WIRELESS_EXT
iw_stats wstats; /* Wireless specific stats */
iw_stats wstats; /* Wireless specific stats */
-#endif
#ifdef WIRELESS_SPY
#ifdef WIRELESS_SPY
- int spy_number; /* Number of addresses to spy */
- mac_addr spy_address[IW_MAX_SPY + 1]; /* The addresses to spy */
- iw_qual spy_stat[IW_MAX_SPY + 1]; /* Statistics gathered */
+ struct iw_spy_data spy_data;
+ struct iw_public_data wireless_data;
#endif /* WIRELESS_SPY */
} ray_dev_t;
#endif /* WIRELESS_SPY */
} ray_dev_t;