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_cs.c | |
| parent | f5ece8fc8d3f5e36bda3554b74b0fbecb0a14309 (diff) | |
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_cs.c')
| -rw-r--r-- | drivers/net/wireless/libertas/if_cs.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c index 5fadcc03eea..54b1ba3e250 100644 --- a/drivers/net/wireless/libertas/if_cs.c +++ b/drivers/net/wireless/libertas/if_cs.c @@ -253,19 +253,13 @@ static irqreturn_t if_cs_interrupt(int irq, void *data) /* Not for us */ return IRQ_NONE; - } else if(int_cause == 0xffff) { + } else if (int_cause == 0xffff) { /* Read in junk, the card has probably been removed */ card->priv->adapter->surpriseremoved = 1; } else { - if(int_cause & IF_CS_H_IC_TX_OVER) { - card->priv->dnld_sent = DNLD_RES_RECEIVED; - if (!card->priv->adapter->cur_cmd) - wake_up_interruptible(&card->priv->waitq); - - if (card->priv->adapter->connect_status == LBS_CONNECTED) - netif_wake_queue(card->priv->dev); - } + if (int_cause & IF_CS_H_IC_TX_OVER) + lbs_host_to_card_done(card->priv); /* clear interrupt */ if_cs_write16(card, IF_CS_C_INT_CAUSE, int_cause & IF_CS_C_IC_MASK); |