diff options
Diffstat (limited to 'drivers/net/wireless/libertas/main.c')
-rw-r--r-- | drivers/net/wireless/libertas/main.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c index 8c4fceaa486b..417f92771375 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] = | |||
169 | */ | 169 | */ |
170 | u8 libertas_adhoc_rates_b[4] = { 0x82, 0x84, 0x8b, 0x96 }; | 170 | u8 libertas_adhoc_rates_b[4] = { 0x82, 0x84, 0x8b, 0x96 }; |
171 | 171 | ||
172 | #define MAX_DEVS 5 | ||
173 | static struct net_device *libertas_devs[MAX_DEVS]; | ||
174 | static int libertas_found = 0; | ||
175 | |||
176 | /** | 172 | /** |
177 | * the table to keep region code | 173 | * the table to keep region code |
178 | */ | 174 | */ |
@@ -851,11 +847,6 @@ wlan_private *wlan_add_card(void *card) | |||
851 | 847 | ||
852 | libertas_debugfs_init_one(priv, dev); | 848 | libertas_debugfs_init_one(priv, dev); |
853 | 849 | ||
854 | if (libertas_found == MAX_DEVS) | ||
855 | goto err_init_fw; | ||
856 | libertas_devs[libertas_found] = dev; | ||
857 | libertas_found++; | ||
858 | |||
859 | lbs_deb_leave_args(LBS_DEB_NET, "priv %p", priv); | 850 | lbs_deb_leave_args(LBS_DEB_NET, "priv %p", priv); |
860 | return priv; | 851 | return priv; |
861 | 852 | ||
@@ -960,7 +951,6 @@ int wlan_remove_card(wlan_private *priv) | |||
960 | wlan_adapter *adapter; | 951 | wlan_adapter *adapter; |
961 | struct net_device *dev; | 952 | struct net_device *dev; |
962 | union iwreq_data wrqu; | 953 | union iwreq_data wrqu; |
963 | int i; | ||
964 | 954 | ||
965 | lbs_deb_enter(LBS_DEB_NET); | 955 | lbs_deb_enter(LBS_DEB_NET); |
966 | 956 | ||
@@ -1003,14 +993,6 @@ int wlan_remove_card(wlan_private *priv) | |||
1003 | lbs_deb_net("free adapter\n"); | 993 | lbs_deb_net("free adapter\n"); |
1004 | libertas_free_adapter(priv); | 994 | libertas_free_adapter(priv); |
1005 | 995 | ||
1006 | for (i = 0; i<libertas_found; i++) { | ||
1007 | if (libertas_devs[i]==priv->wlan_dev.netdev) { | ||
1008 | libertas_devs[i] = libertas_devs[--libertas_found]; | ||
1009 | libertas_devs[libertas_found] = NULL ; | ||
1010 | break ; | ||
1011 | } | ||
1012 | } | ||
1013 | |||
1014 | lbs_deb_net("unregister finish\n"); | 996 | lbs_deb_net("unregister finish\n"); |
1015 | 997 | ||
1016 | priv->wlan_dev.netdev = NULL; | 998 | priv->wlan_dev.netdev = NULL; |
@@ -1161,15 +1143,8 @@ static int wlan_init_module(void) | |||
1161 | 1143 | ||
1162 | static void wlan_cleanup_module(void) | 1144 | static void wlan_cleanup_module(void) |
1163 | { | 1145 | { |
1164 | int i; | ||
1165 | |||
1166 | lbs_deb_enter(LBS_DEB_MAIN); | 1146 | lbs_deb_enter(LBS_DEB_MAIN); |
1167 | 1147 | ||
1168 | for (i = 0; i<libertas_found; i++) { | ||
1169 | wlan_private *priv = libertas_devs[i]->priv; | ||
1170 | reset_device(priv); | ||
1171 | } | ||
1172 | |||
1173 | libertas_sbi_unregister(); | 1148 | libertas_sbi_unregister(); |
1174 | libertas_debugfs_remove(); | 1149 | libertas_debugfs_remove(); |
1175 | 1150 | ||