aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/wireless/libertas/main.c
diff options
context:
space:
mode:
authorHolger Schurig <hs4233@mail.mn-solutions.de>2007-05-25 12:01:42 -0400
committerJohn W. Linville <linville@tuxdriver.com>2007-06-11 14:28:38 -0400
commit3874d0fefd965eedfc7f8e0a5459ddf914eb4306 (patch)
treeece3d62a0667d9650db6496457286a528b539861 /drivers/net/wireless/libertas/main.c
parentfb3dddf22c63d7e0622d4819a87dbb8563f0e968 (diff)
[PATCH] libertas: move reset_device() code main.c to if_usb.c
The reset_device() logic is only needed for USB devices, not for CF devices. Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/main.c')
-rw-r--r--drivers/net/wireless/libertas/main.c25
1 files changed, 0 insertions, 25 deletions
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 8c4fceaa486..417f9277137 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -169,10 +169,6 @@ u8 libertas_adhoc_rates_g[G_SUPPORTED_RATES] =
*/
u8 libertas_adhoc_rates_b[4] = { 0x82, 0x84, 0x8b, 0x96 };
-#define MAX_DEVS 5
-static struct net_device *libertas_devs[MAX_DEVS];
-static int libertas_found = 0;
-
/**
* the table to keep region code
*/
@@ -851,11 +847,6 @@ wlan_private *wlan_add_card(void *card)
libertas_debugfs_init_one(priv, dev);
- if (libertas_found == MAX_DEVS)
- goto err_init_fw;
- libertas_devs[libertas_found] = dev;
- libertas_found++;
-
lbs_deb_leave_args(LBS_DEB_NET, "priv %p", priv);
return priv;
@@ -960,7 +951,6 @@ int wlan_remove_card(wlan_private *priv)
wlan_adapter *adapter;
struct net_device *dev;
union iwreq_data wrqu;
- int i;
lbs_deb_enter(LBS_DEB_NET);
@@ -1003,14 +993,6 @@ int wlan_remove_card(wlan_private *priv)
lbs_deb_net("free adapter\n");
libertas_free_adapter(priv);
- for (i = 0; i<libertas_found; i++) {
- if (libertas_devs[i]==priv->wlan_dev.netdev) {
- libertas_devs[i] = libertas_devs[--libertas_found];
- libertas_devs[libertas_found] = NULL ;
- break ;
- }
- }
-
lbs_deb_net("unregister finish\n");
priv->wlan_dev.netdev = NULL;
@@ -1161,15 +1143,8 @@ static int wlan_init_module(void)
static void wlan_cleanup_module(void)
{
- int i;
-
lbs_deb_enter(LBS_DEB_MAIN);
- for (i = 0; i<libertas_found; i++) {
- wlan_private *priv = libertas_devs[i]->priv;
- reset_device(priv);
- }
-
libertas_sbi_unregister();
libertas_debugfs_remove();