[PATCH 2.6.24 4/5]S2io: Check for CARD_DOWN before handling traffic

[Ramkrishna Vepa]

- Added check to return from the traffic handling function, if the card status 
  is DOWN.

Signed-off-by: Sivakumar Subramani <[EMAIL PROTECTED]>
Signed-off-by: Santosh Rastapur <[EMAIL PROTECTED]>
Signed-off-by: Ramkrishna Vepa <[EMAIL PROTECTED]>
---
diff -Nurp patch3/drivers/net/s2io.c patch4/drivers/net/s2io.c
--- patch3/drivers/net/s2io.c   2007-08-15 08:57:32.000000000 -0700
+++ patch4/drivers/net/s2io.c   2007-08-15 08:42:14.000000000 -0700
@@ -2927,6 +2927,11 @@ static int s2io_poll(struct net_device *
        int i;
 
        atomic_inc(&nic->isr_cnt);
+       if (unlikely(atomic_read(&nic->card_state) == CARD_DOWN)) {
+               atomic_dec(&nic->isr_cnt);
+               return IRQ_NONE;
+       }
+
        mac_control = &nic->mac_control;
        config = &nic->config;
 
@@ -3062,12 +3067,6 @@ static void rx_intr_handler(struct ring_
        struct RxD3* rxdp3;
 
        spin_lock(&nic->rx_lock);
-       if (atomic_read(&nic->card_state) == CARD_DOWN) {
-               DBG_PRINT(INTR_DBG, "%s: %s going down for reset\n",
-                         __FUNCTION__, dev->name);
-               spin_unlock(&nic->rx_lock);
-               return;
-       }
 
        get_info = ring_data->rx_curr_get_info;
        get_block = get_info.block_index;
@@ -4404,6 +4403,10 @@ static irqreturn_t s2io_msix_ring_handle
        struct s2io_nic *sp = ring->nic;
 
        atomic_inc(&sp->isr_cnt);
+       if (unlikely(atomic_read(&sp->card_state) == CARD_DOWN)){
+               atomic_dec(&sp->isr_cnt);
+               return IRQ_HANDLED;
+       }
 
        rx_intr_handler(ring);
        s2io_chk_rx_buffers(sp, ring->ring_no);
@@ -4418,6 +4421,10 @@ static irqreturn_t s2io_msix_fifo_handle
        struct s2io_nic *sp = fifo->nic;
 
        atomic_inc(&sp->isr_cnt);
+       if (unlikely(atomic_read(&sp->card_state) == CARD_DOWN)){
+               atomic_dec(&sp->isr_cnt);
+               return IRQ_HANDLED;
+       }
        tx_intr_handler(fifo);
        atomic_dec(&sp->isr_cnt);
        return IRQ_HANDLED;
@@ -4896,6 +4903,11 @@ static irqreturn_t s2io_isr(int irq, voi
                return IRQ_NONE;
 
        atomic_inc(&sp->isr_cnt);
+       if (unlikely(atomic_read(&sp->card_state) == CARD_DOWN)) {
+               atomic_dec(&sp->isr_cnt);
+               return IRQ_NONE;
+       }
+
        mac_control = &sp->mac_control;
        config = &sp->config;
 



-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html