From: Andre Heider Date: Tue, 12 Jul 2011 10:13:25 +0000 (+0000) Subject: ps3_gelic: Fix start_xmit kick error path X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bb4f85ce1731d78648870333f0ce77123fa162e6;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git ps3_gelic: Fix start_xmit kick error path Revert to a proper state when gelic_card_kick_txdma() fails: - Don't trigger BUG_ON when releasing the unsent tx descriptor - Reset the tx chain head since the tail was not modified and hence not in sync - Unlink the released descriptor bus address from its predecessor Signed-off-by: Andre Heider Acked-by: Geoff Levand Signed-off-by: David S. Miller --- diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ps3_gelic_net.c index 9652d10b0159..94422fcc8576 100644 --- a/drivers/net/ps3_gelic_net.c +++ b/drivers/net/ps3_gelic_net.c @@ -897,12 +897,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__); }