diff options
| author | Sivakumar Subramani <Sivakumar.Subramani@neterion.com> | 2007-02-24 02:01:31 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-27 04:27:11 -0500 |
| commit | ac1f90d6f1267b916c47cc5a033ef5ec1baf4280 (patch) | |
| tree | 92dde369ee9bfafd00ab8e5b12bc4d77a7b4b674 /drivers | |
| parent | 926930b202d56c3dfb6aea0a0c6bfba2b87a8c03 (diff) | |
| download | linux-ac1f90d6f1267b916c47cc5a033ef5ec1baf4280.tar.gz linux-ac1f90d6f1267b916c47cc5a033ef5ec1baf4280.tar.bz2 linux-ac1f90d6f1267b916c47cc5a033ef5ec1baf4280.zip | |
S2IO: Making LED off during LINK_DOWN notification.
- Turning off LED for LINK_DOWN notification
- Return from rxd_owner_bit_reset function if call to set_rxd_buffer_pointer
fails with ENOMEM
Signed-off-by: Sivakumar Subramani <sivakumar.subramani@neterion.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/s2io.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 89881aa2fc31..7c3551bad14c 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c @@ -4127,6 +4127,11 @@ static void s2io_txpic_intr_handle(struct s2io_nic *sp) val64 &= ~GPIO_INT_MASK_LINK_UP; val64 |= GPIO_INT_MASK_LINK_DOWN; writeq(val64, &bar0->gpio_int_mask); + + /* turn off LED */ + val64 = readq(&bar0->adapter_control); + val64 = val64 &(~ADAPTER_LED_ON); + writeq(val64, &bar0->adapter_control); } } val64 = readq(&bar0->gpio_int_mask); @@ -6124,10 +6129,13 @@ static int rxd_owner_bit_reset(struct s2io_nic *sp) rx_blocks[j].rxds[k].virt_addr; if(sp->rxd_mode >= RXD_MODE_3A) ba = &mac_control->rings[i].ba[j][k]; - set_rxd_buffer_pointer(sp, rxdp, ba, + if (set_rxd_buffer_pointer(sp, rxdp, ba, &skb,(u64 *)&temp0_64, (u64 *)&temp1_64, - (u64 *)&temp2_64, size); + (u64 *)&temp2_64, + size) == ENOMEM) { + return 0; + } set_rxd_buffer_size(sp, rxdp, size); wmb(); |