summaryrefslogtreecommitdiffstats
path: root/drivers/net/e100.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-03-16 19:15:26 -0500
committerJeff Garzik <jeff@garzik.org>2006-03-16 19:15:26 -0500
commitca68bb1e41c4937fc125d3917dd1feadc493d850 (patch)
tree54197e794bd376ceacaea6c8f088f44017f18a7b /drivers/net/e100.c
parent485ff09990416c75ae9593ddc71619939ab9dd51 (diff)
parentaa49cdd93be6328113f0c146fc72be173d578d27 (diff)
downloadkernel-uprobes-ca68bb1e41c4937fc125d3917dd1feadc493d850.tar.gz
kernel-uprobes-ca68bb1e41c4937fc125d3917dd1feadc493d850.tar.xz
kernel-uprobes-ca68bb1e41c4937fc125d3917dd1feadc493d850.zip
Merge branch 'e100-fixes' of git://198.78.49.142/~jbrandeb/linux-2.6
Diffstat (limited to 'drivers/net/e100.c')
-rw-r--r--drivers/net/e100.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 24253c807e5..f57a85feda3 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;