Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[pandora-kernel.git] / drivers / net / ps3_gelic_net.c

diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ps3_gelic_net.c
index 9652d10..d82a82d 100644 (file)
--- a/drivers/net/ps3_gelic_net.c
+++ b/drivers/net/ps3_gelic_net.c
@@ -838,9 +838,11 @@ static int gelic_card_kick_txdma(struct gelic_card *card,
                card->tx_dma_progress = 1;
                status = lv1_net_start_tx_dma(bus_id(card), dev_id(card),
                                              descr->bus_addr, 0);
-               if (status)
+               if (status) {
+                       card->tx_dma_progress = 0;
                        dev_info(ctodev(card), "lv1_net_start_txdma failed," \
                                 "status=%d\n", status);
+               }
        }
        return status;
 }
@@ -897,12 +899,16 @@ int gelic_net_xmit(struct sk_buff *skb, struct net_device *netdev)
        if (gelic_card_kick_txdma(card, descr)) {
                /*
                 * kick failed.
-                * release descriptors which were just prepared
+                * release descriptor which was just prepared
                 */
                netdev->stats.tx_dropped++;
+               /* don't trigger BUG_ON() in gelic_descr_release_tx */
+               descr->data_status = cpu_to_be32(GELIC_DESCR_TX_TAIL);
                gelic_descr_release_tx(card, descr);
-               gelic_descr_release_tx(card, descr->next);
-               card->tx_chain.tail = descr->next->next;
+               /* reset head */
+               card->tx_chain.head = descr;
+               /* reset hw termination */
+               descr->prev->next_descr_addr = 0;
                dev_info(ctodev(card), "%s: kick failure\n", __func__);
        }
 
@@ -987,10 +993,6 @@ static int gelic_card_decode_one_descr(struct gelic_card *card)
        int dmac_chain_ended;
 
        status = gelic_descr_get_status(descr);
-       /* is this descriptor terminated with next_descr == NULL? */
-       dmac_chain_ended =
-               be32_to_cpu(descr->dmac_cmd_status) &
-               GELIC_DESCR_RX_DMA_CHAIN_END;
 
        if (status == GELIC_DESCR_DMA_CARDOWNED)
                return 0;
@@ -1053,6 +1055,11 @@ static int gelic_card_decode_one_descr(struct gelic_card *card)
        /* ok, we've got a packet in descr */
        gelic_net_pass_skb_up(descr, card, netdev);
 refill:
+
+       /* is the current descriptor terminated with next_descr == NULL? */
+       dmac_chain_ended =
+               be32_to_cpu(descr->dmac_cmd_status) &
+               GELIC_DESCR_RX_DMA_CHAIN_END;
        /*
         * So that always DMAC can see the end
         * of the descriptor chain to avoid
@@ -1081,10 +1088,9 @@ refill:
         * If dmac chain was met, DMAC stopped.
         * thus re-enable it
         */
-       if (dmac_chain_ended) {
-               card->rx_dma_restart_required = 1;
-               dev_dbg(ctodev(card), "reenable rx dma scheduled\n");
-       }
+
+       if (dmac_chain_ended)
+               gelic_card_enable_rxdmac(card);
 
        return 1;
 }
@@ -1150,11 +1156,6 @@ static irqreturn_t gelic_card_interrupt(int irq, void *ptr)
 
        status &= card->irq_mask;
 
-       if (card->rx_dma_restart_required) {
-               card->rx_dma_restart_required = 0;
-               gelic_card_enable_rxdmac(card);
-       }
-
        if (status & GELIC_CARD_RXINT) {
                gelic_card_rx_irq_off(card);
                napi_schedule(&card->napi);