libertas: fix GSPI card event handling

The GPSI interface driver does not re-enable the Card Event Interrupt, which
causes problems after a card event (for example: link-loss) comes in.  This
can lead, for example, to the card failing to re-associate.  This patch
ensures that we re-enable the Card Event Interrupt when we handle card events.

Signed-off-by: Andrey Yurovsky <andrey@cozybit.com>
Acked-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/libertas/if_spi.c b/drivers/net/wireless/libertas/if_spi.c
index dccd01fd1f1056a7bef0b3652d931a7692ab472e..5fa55fe1f86007b2387210b885dbfc567bec4aa4 100644 (file)
--- a/drivers/net/wireless/libertas/if_spi.c
+++ b/drivers/net/wireless/libertas/if_spi.c
@@ -814,6 +814,13 @@ static void if_spi_e2h(struct if_spi_card *card)
        if (err)
                goto out;
 
+       /* re-enable the card event interrupt */
+       spu_write_u16(card, IF_SPI_HOST_INT_STATUS_REG,
+                       ~IF_SPI_HICU_CARD_EVENT);
+
+       /* generate a card interrupt */
+       spu_write_u16(card, IF_SPI_CARD_INT_CAUSE_REG, IF_SPI_CIC_HOST_EVENT);
+
        spin_lock_irqsave(&priv->driver_lock, flags);
        lbs_queue_event(priv, cause & 0xff);
        spin_unlock_irqrestore(&priv->driver_lock, flags);