Skip to content

L
linux-davinci
Commit ca68bb1e authored by Jeff Garzik's avatar Jeff Garzik
Browse files
Options

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

parents 485ff099 aa49cdd9
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
drivers/net/e100.c
View file @ ca68bb1e
...@@ -2154,6 +2154,9 @@ static int e100_loopback_test(struct nic *nic, enum loopback loopback_mode) ...@@ -2154,6 +2154,9 @@ static int e100_loopback_test(struct nic *nic, enum loopback loopback_mode)
msleep(10); 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), if(memcmp(nic->rx_to_clean->skb->data + sizeof(struct rfd),
skb->data, ETH_DATA_LEN)) skb->data, ETH_DATA_LEN))
err = -EAGAIN; err = -EAGAIN;
...@@ -2161,8 +2164,8 @@ static int e100_loopback_test(struct nic *nic, enum loopback loopback_mode) ...@@ -2161,8 +2164,8 @@ static int e100_loopback_test(struct nic *nic, enum loopback loopback_mode)
err_loopback_none: err_loopback_none:
mdio_write(nic->netdev, nic->mii.phy_id, MII_BMCR, 0); mdio_write(nic->netdev, nic->mii.phy_id, MII_BMCR, 0);
nic->loopback = lb_none; nic->loopback = lb_none;
e100_hw_init(nic);
e100_clean_cbs(nic); e100_clean_cbs(nic);
e100_hw_reset(nic);
err_clean_rx: err_clean_rx:
e100_rx_clean_list(nic); e100_rx_clean_list(nic);
return err; return err;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment