diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-12-06 14:36:11 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 15:06:01 -0800 |
| commit | e775ed7c677b163c80643036c32e23d3e59b9429 (patch) | |
| tree | 909af580ca37910f462b613ba60a4e97e3035209 /drivers/net/wireless/libertas/if_usb.c | |
| parent | f5ece8fc8d3f5e36bda3554b74b0fbecb0a14309 (diff) | |
| download | lwn-e775ed7c677b163c80643036c32e23d3e59b9429.tar.gz lwn-e775ed7c677b163c80643036c32e23d3e59b9429.zip | |
libertas: Consolidate lbs_host_to_card_done() function.
As we move towards having this done by a state machine, start by having
a single 'stuff sent' function, which is called by if_usb/if_sdio/if_cs
after sending both data and commands.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
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.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c index c27ffcfdbe88..418dcab8b1cc 100644 --- a/drivers/net/wireless/libertas/if_usb.c +++ b/drivers/net/wireless/libertas/if_usb.c @@ -66,22 +66,8 @@ static void if_usb_write_bulk_callback(struct urb *urb) /* Used for both firmware TX and regular TX. priv isn't * valid at firmware load time. */ - if (priv) { - struct lbs_adapter *adapter = priv->adapter; - struct net_device *dev = priv->dev; - - priv->dnld_sent = DNLD_RES_RECEIVED; - - /* Wake main thread if commands are pending */ - if (!adapter->cur_cmd) - wake_up_interruptible(&priv->waitq); - - if (adapter->connect_status == LBS_CONNECTED) - netif_wake_queue(dev); - - if (priv->mesh_dev && (adapter->mesh_connect_status == LBS_CONNECTED)) - netif_wake_queue(priv->mesh_dev); - } + if (priv) + lbs_host_to_card_done(priv); } else { /* print the failure status number for debug */ lbs_pr_info("URB in failure status: %d\n", urb->status); |