aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/s2io.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/s2io.c')
-rw-r--r--drivers/net/s2io.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index b5c1e663417d..5694e894fc7a 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -2566,7 +2566,7 @@ static int fill_rx_buffers(struct ring_info *ring)
2566 if (block_no) 2566 if (block_no)
2567 rxd_index += (block_no * ring->rxd_count); 2567 rxd_index += (block_no * ring->rxd_count);
2568 2568
2569 if ((block_no == block_no1) && 2569 if ((block_no == block_no1) &&
2570 (off == ring->rx_curr_get_info.offset) && 2570 (off == ring->rx_curr_get_info.offset) &&
2571 (rxdp->Host_Control)) { 2571 (rxdp->Host_Control)) {
2572 DBG_PRINT(INTR_DBG, "%s: Get and Put", 2572 DBG_PRINT(INTR_DBG, "%s: Get and Put",
@@ -2612,7 +2612,7 @@ static int fill_rx_buffers(struct ring_info *ring)
2612 first_rxdp->Control_1 |= RXD_OWN_XENA; 2612 first_rxdp->Control_1 |= RXD_OWN_XENA;
2613 } 2613 }
2614 stats->mem_alloc_fail_cnt++; 2614 stats->mem_alloc_fail_cnt++;
2615 2615
2616 return -ENOMEM ; 2616 return -ENOMEM ;
2617 } 2617 }
2618 stats->mem_allocated += skb->truesize; 2618 stats->mem_allocated += skb->truesize;
@@ -6999,7 +6999,7 @@ static int rxd_owner_bit_reset(struct s2io_nic *sp)
6999 &skb,(u64 *)&temp0_64, 6999 &skb,(u64 *)&temp0_64,
7000 (u64 *)&temp1_64, 7000 (u64 *)&temp1_64,
7001 (u64 *)&temp2_64, 7001 (u64 *)&temp2_64,
7002 size) == ENOMEM) { 7002 size) == -ENOMEM) {
7003 return 0; 7003 return 0;
7004 } 7004 }
7005 7005