diff options
| author | Andre Heider <a.heider@gmail.com> | 2011-07-12 14:13:25 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-14 21:12:15 +0400 |
| commit | bb4f85ce1731d78648870333f0ce77123fa162e6 (patch) | |
| tree | 9a7606be3fcabc487474dbec4511016cc9ddc4b1 /drivers/net/ps3_gelic_net.c | |
| parent | e3001c98df51d81a72534837d8069bfb53f3e1ea (diff) | |
| download | linux-bb4f85ce1731d78648870333f0ce77123fa162e6.tar.xz | |
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 <a.heider@gmail.com>
Acked-by: Geoff Levand <geoff@infradead.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ps3_gelic_net.c')
| -rw-r--r-- | drivers/net/ps3_gelic_net.c | 10 |
1 files changed, 7 insertions, 3 deletions
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__); } |