Merge branch 'e100-fixes' of git://198.78.49.142/~jbrandeb/linux-2.6

git-mirror · Mar 17, 2006 · ca68bb1 · ca68bb1
2 parents 485ff09 + aa49cdd
commit ca68bb1
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
@@ -2154,15 +2154,18 @@ 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;
 
 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;