}
}
-static void eth_complete_tx(struct sw *sw)
+static int eth_complete_tx(struct sw *sw)
{
struct _tx_ring *tx_ring = &sw->tx_ring;
struct tx_desc *desc;
tx_ring->free_index = index;
tx_ring->num_used -= i;
eth_check_num_used(tx_ring);
+
+ return TX_DESCS - tx_ring->num_used;
}
static int eth_poll(struct napi_struct *napi, int budget)
}
}
+ rx_ring->cur_index = i;
if (!received) {
napi_complete(napi);
enable_irq(IRQ_CNS3XXX_SW_R0RXC);
+
+ /* if rx descriptors are full schedule another poll */
+ if (rx_ring->desc[(i-1) & (RX_DESCS-1)].cown)
+ eth_schedule_poll(sw);
}
- cns3xxx_alloc_rx_buf(sw, received);
+ spin_lock_bh(&tx_lock);
+ eth_complete_tx(sw);
+ spin_unlock_bh(&tx_lock);
- rx_ring->cur_index = i;
+ cns3xxx_alloc_rx_buf(sw, received);
wmb();
enable_rx_dma(sw);
- spin_lock_bh(&tx_lock);
- eth_complete_tx(sw);
- spin_unlock_bh(&tx_lock);
-
return received;
}
skb_walk_frags(skb, skb1)
nr_desc++;
- eth_schedule_poll(sw);
spin_lock_bh(&tx_lock);
if ((tx_ring->num_used + nr_desc + 1) >= TX_DESCS) {
- spin_unlock_bh(&tx_lock);
- return NETDEV_TX_BUSY;
+ /* clean up tx descriptors when needed */
+ if (eth_complete_tx(sw) < nr_desc) {
+ spin_unlock_bh(&tx_lock);
+ return NETDEV_TX_BUSY;
+ }
}
index = index0 = tx_ring->cur_index;