aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas/if_cs.c
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2007-12-06 09:36:11 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:06:01 -0500
commite775ed7c677b163c80643036c32e23d3e59b9429 (patch)
tree909af580ca37910f462b613ba60a4e97e3035209 /drivers/net/wireless/libertas/if_cs.c
parentf5ece8fc8d3f5e36bda3554b74b0fbecb0a14309 (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.c12
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 5fadcc03eea5..54b1ba3e250a 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)
253 /* Not for us */ 253 /* Not for us */
254 return IRQ_NONE; 254 return IRQ_NONE;
255 255
256 } else if(int_cause == 0xffff) { 256 } else if (int_cause == 0xffff) {
257 /* Read in junk, the card has probably been removed */ 257 /* Read in junk, the card has probably been removed */
258 card->priv->adapter->surpriseremoved = 1; 258 card->priv->adapter->surpriseremoved = 1;
259 259
260 } else { 260 } else {
261 if(int_cause & IF_CS_H_IC_TX_OVER) { 261 if (int_cause & IF_CS_H_IC_TX_OVER)
262 card->priv->dnld_sent = DNLD_RES_RECEIVED; 262 lbs_host_to_card_done(card->priv);
263 if (!card->priv->adapter->cur_cmd)
264 wake_up_interruptible(&card->priv->waitq);
265
266 if (card->priv->adapter->connect_status == LBS_CONNECTED)
267 netif_wake_queue(card->priv->dev);
268 }
269 263
270 /* clear interrupt */ 264 /* clear interrupt */
271 if_cs_write16(card, IF_CS_C_INT_CAUSE, int_cause & IF_CS_C_IC_MASK); 265 if_cs_write16(card, IF_CS_C_INT_CAUSE, int_cause & IF_CS_C_IC_MASK);