diff options
author | Jean Tourrilhes <jt@hpl.hp.com> | 2005-09-02 14:37:38 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-06 22:44:23 -0400 |
commit | 00b309f561e9746fd6ac9598c4203c6610fcb26c (patch) | |
tree | 708e1a72653aeb55ecb116332344bf8966278513 | |
parent | 72f98d38a890822cf547f94c8fbdef591b082ec2 (diff) |
[PATCH] wl3501_cs : WE-17 support
wl3501_cs won't compile with WE-19. This patches fixes it.
Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com>
Acked-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
-rw-r--r-- | drivers/net/wireless/wl3501.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/wl3501_cs.c | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl3501.h b/drivers/net/wireless/wl3501.h index b5719437e981..7fcbe589c3f2 100644 --- a/drivers/net/wireless/wl3501.h +++ b/drivers/net/wireless/wl3501.h | |||
@@ -609,6 +609,7 @@ struct wl3501_card { | |||
609 | struct net_device_stats stats; | 609 | struct net_device_stats stats; |
610 | struct iw_statistics wstats; | 610 | struct iw_statistics wstats; |
611 | struct iw_spy_data spy_data; | 611 | struct iw_spy_data spy_data; |
612 | struct iw_public_data wireless_data; | ||
612 | struct dev_node_t node; | 613 | struct dev_node_t node; |
613 | }; | 614 | }; |
614 | #endif | 615 | #endif |
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c index 7cc5edbf6ede..3f8c27f0871b 100644 --- a/drivers/net/wireless/wl3501_cs.c +++ b/drivers/net/wireless/wl3501_cs.c | |||
@@ -1944,7 +1944,7 @@ static const iw_handler wl3501_handler[] = { | |||
1944 | static const struct iw_handler_def wl3501_handler_def = { | 1944 | static const struct iw_handler_def wl3501_handler_def = { |
1945 | .num_standard = sizeof(wl3501_handler) / sizeof(iw_handler), | 1945 | .num_standard = sizeof(wl3501_handler) / sizeof(iw_handler), |
1946 | .standard = (iw_handler *)wl3501_handler, | 1946 | .standard = (iw_handler *)wl3501_handler, |
1947 | .spy_offset = offsetof(struct wl3501_card, spy_data), | 1947 | .get_wireless_stats = wl3501_get_wireless_stats, |
1948 | }; | 1948 | }; |
1949 | 1949 | ||
1950 | /** | 1950 | /** |
@@ -1961,6 +1961,7 @@ static dev_link_t *wl3501_attach(void) | |||
1961 | client_reg_t client_reg; | 1961 | client_reg_t client_reg; |
1962 | dev_link_t *link; | 1962 | dev_link_t *link; |
1963 | struct net_device *dev; | 1963 | struct net_device *dev; |
1964 | struct wl3501_card *this; | ||
1964 | int ret; | 1965 | int ret; |
1965 | 1966 | ||
1966 | /* Initialize the dev_link_t structure */ | 1967 | /* Initialize the dev_link_t structure */ |
@@ -1995,7 +1996,9 @@ static dev_link_t *wl3501_attach(void) | |||
1995 | dev->tx_timeout = wl3501_tx_timeout; | 1996 | dev->tx_timeout = wl3501_tx_timeout; |
1996 | dev->watchdog_timeo = 5 * HZ; | 1997 | dev->watchdog_timeo = 5 * HZ; |
1997 | dev->get_stats = wl3501_get_stats; | 1998 | dev->get_stats = wl3501_get_stats; |
1998 | dev->get_wireless_stats = wl3501_get_wireless_stats; | 1999 | this = dev->priv; |
2000 | this->wireless_data.spy_data = &this->spy_data; | ||
2001 | dev->wireless_data = &this->wireless_data; | ||
1999 | dev->wireless_handlers = (struct iw_handler_def *)&wl3501_handler_def; | 2002 | dev->wireless_handlers = (struct iw_handler_def *)&wl3501_handler_def; |
2000 | SET_ETHTOOL_OPS(dev, &ops); | 2003 | SET_ETHTOOL_OPS(dev, &ops); |
2001 | netif_stop_queue(dev); | 2004 | netif_stop_queue(dev); |