summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas/if_usb.c
diff options
context:
space:
mode:
authorHolger Schurig2007-05-25 18:04:31 +0200
committerJohn W. Linville2007-06-11 20:28:38 +0200
commit32a74b7c8f7b883b532e0e4333b7c3014d3d8fe8 (patch)
treeef19ed4732bfd73818f6ddfc83b90e2b3eb4363d /drivers/net/wireless/libertas/if_usb.c
parent[PATCH] libertas: move reset_device() code main.c to if_usb.c (diff)
downloadkernel-qcow2-linux-32a74b7c8f7b883b532e0e4333b7c3014d3d8fe8.tar.gz
kernel-qcow2-linux-32a74b7c8f7b883b532e0e4333b7c3014d3d8fe8.tar.xz
kernel-qcow2-linux-32a74b7c8f7b883b532e0e4333b7c3014d3d8fe8.zip
[PATCH] libertas: split wlan_add_card()
Split wlan_add_card() into a part that just setups kernel parameters and into the function libertas_activate_card(), which will implizitly use hardware functions by the started thread. This allows us later to do something like this: priv = libertas_add_card(); priv->hw_command_to_host = if_usb_command_to_host; priv->hw_xxxx = if_usb_xxxx; priv->hw_yyyy = if_usb_yyyy; wlan_activate_card() and of course the CF driver can set it's own functions. 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/if_usb.c')
-rw-r--r--drivers/net/wireless/libertas/if_usb.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index 99f4ba35d6ef..e4caf3e4b352 100644
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -195,6 +195,9 @@ static int if_usb_probe(struct usb_interface *intf,
if (!(priv = wlan_add_card(usb_cardp)))
goto dealloc;
+ if (libertas_activate_card(priv))
+ goto dealloc;
+
if (libertas_found < MAX_DEVS) {
libertas_devs[libertas_found] = priv->wlan_dev.netdev;
libertas_found++;