summaryrefslogtreecommitdiffstats
path: root/drivers/net/ps3_gelic_net.c
diff options
context:
space:
mode:
authorMasakazu Mokuno <mokuno@sm.sony.co.jp>2007-08-31 22:25:09 +0900
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 16:51:01 -0700
commitdc029ad97f267cbd1c2e978a443eb5ae93a55328 (patch)
tree131d1b54f4536516b6ceb1e54ac5e4aefe20c4d1 /drivers/net/ps3_gelic_net.c
parent173261ed37e7a98cedfcc808eb07eeceee66e078 (diff)
downloadop-kernel-dev-dc029ad97f267cbd1c2e978a443eb5ae93a55328.zip
op-kernel-dev-dc029ad97f267cbd1c2e978a443eb5ae93a55328.tar.gz
PS3: Remove the workaround no longer needed
Removed the workaround that was needed for PS3 firmware versions prior to the first release. Signed-off-by: Masakazu Mokuno <mokuno@sm.sony.co.jp> CC: Geoff Levand <geoffrey.levand@am.sony.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/ps3_gelic_net.c')
-rw-r--r--drivers/net/ps3_gelic_net.c16
1 files changed, 4 insertions, 12 deletions
diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ps3_gelic_net.c
index 31c3092..93c2c39 100644
--- a/drivers/net/ps3_gelic_net.c
+++ b/drivers/net/ps3_gelic_net.c
@@ -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;
}
OpenPOWER on IntegriCloud