Commit ca68bb1e41c4937fc125d3917dd1feadc493d850
Exists in
master
and in
4 other branches
Merge branch 'e100-fixes' of git://198.78.49.142/~jbrandeb/linux-2.6
Showing 1 changed file Side-by-side Diff
drivers/net/e100.c
| ... | ... | @@ -2154,6 +2154,9 @@ |
| 2154 | 2154 | |
| 2155 | 2155 | msleep(10); |
| 2156 | 2156 | |
| 2157 | + pci_dma_sync_single_for_cpu(nic->pdev, nic->rx_to_clean->dma_addr, | |
| 2158 | + RFD_BUF_LEN, PCI_DMA_FROMDEVICE); | |
| 2159 | + | |
| 2157 | 2160 | if(memcmp(nic->rx_to_clean->skb->data + sizeof(struct rfd), |
| 2158 | 2161 | skb->data, ETH_DATA_LEN)) |
| 2159 | 2162 | err = -EAGAIN; |
| 2160 | 2163 | |
| ... | ... | @@ -2161,8 +2164,8 @@ |
| 2161 | 2164 | err_loopback_none: |
| 2162 | 2165 | mdio_write(nic->netdev, nic->mii.phy_id, MII_BMCR, 0); |
| 2163 | 2166 | nic->loopback = lb_none; |
| 2164 | - e100_hw_init(nic); | |
| 2165 | 2167 | e100_clean_cbs(nic); |
| 2168 | + e100_hw_reset(nic); | |
| 2166 | 2169 | err_clean_rx: |
| 2167 | 2170 | e100_rx_clean_list(nic); |
| 2168 | 2171 | return err; |