Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 66577
b: refs/heads/master
c: dc029ad
h: refs/heads/master
i:
  66575: 6cdbd6c
v: v3
  • Loading branch information
Masakazu Mokuno authored and David S. Miller committed Oct 10, 2007
1 parent 6c2774e commit bd349d1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 13 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 173261ed37e7a98cedfcc808eb07eeceee66e078
refs/heads/master: dc029ad97f267cbd1c2e978a443eb5ae93a55328
16 changes: 4 additions & 12 deletions trunk/drivers/net/ps3_gelic_net.c
Original file line number Diff line number Diff line change
Expand Up @@ -716,25 +716,17 @@ static int gelic_net_kick_txdma(struct gelic_net_card *card,
struct gelic_net_descr *descr)
{
int status = 0;
int count = 10;

if (card->tx_dma_progress)
return 0;

if (gelic_net_get_descr_status(descr) == GELIC_NET_DESCR_CARDOWNED) {
card->tx_dma_progress = 1;
/* sometimes we need retry here */
while (count--) {
status = lv1_net_start_tx_dma(bus_id(card),
dev_id(card),
descr->bus_addr, 0);
if (!status)
break;
}
if (!count)
status = lv1_net_start_tx_dma(bus_id(card), dev_id(card),
descr->bus_addr, 0);
if (status)
dev_info(ctodev(card), "lv1_net_start_txdma failed," \
"status=%d %#lx\n",
status, card->irq_status);
"status=%d\n", status);
}
return status;
}
Expand Down

0 comments on commit bd349d1

Please sign in to comment.