diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-17 01:15:26 +0100 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-17 01:15:26 +0100 |
| commit | ca68bb1e41c4937fc125d3917dd1feadc493d850 (patch) | |
| tree | 54197e794bd376ceacaea6c8f088f44017f18a7b | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge (diff) | |
| parent | e100: fix eeh on pseries during ethtool -t (diff) | |
| download | linux-ca68bb1e41c4937fc125d3917dd1feadc493d850.tar.xz linux-ca68bb1e41c4937fc125d3917dd1feadc493d850.zip | |
Merge branch 'e100-fixes' of git://198.78.49.142/~jbrandeb/linux-2.6
| -rw-r--r-- | drivers/net/e100.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index 24253c807e55..f57a85feda3d 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c @@ -2154,6 +2154,9 @@ static int e100_loopback_test(struct nic *nic, enum loopback loopback_mode) msleep(10); + pci_dma_sync_single_for_cpu(nic->pdev, nic->rx_to_clean->dma_addr, + RFD_BUF_LEN, PCI_DMA_FROMDEVICE); + if(memcmp(nic->rx_to_clean->skb->data + sizeof(struct rfd), skb->data, ETH_DATA_LEN)) err = -EAGAIN; @@ -2161,8 +2164,8 @@ static int e100_loopback_test(struct nic *nic, enum loopback loopback_mode) err_loopback_none: mdio_write(nic->netdev, nic->mii.phy_id, MII_BMCR, 0); nic->loopback = lb_none; - e100_hw_init(nic); e100_clean_cbs(nic); + e100_hw_reset(nic); err_clean_rx: e100_rx_clean_list(nic); return err; |