summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Brandeburg <jesse.brandeburg@intel.com>2006-03-15 10:55:24 -0800
committerJesse Brandeburg <jesse.brandeburg@intel.com>2006-03-15 10:55:24 -0800
commitaa49cdd93be6328113f0c146fc72be173d578d27 (patch)
tree38346543e8567d031749f220bc9ba76d8352361b
parentf13b83580acef03a36c785dccc534ccdd7e43084 (diff)
downloadkernel-uprobes-aa49cdd93be6328113f0c146fc72be173d578d27.tar.gz
kernel-uprobes-aa49cdd93be6328113f0c146fc72be173d578d27.tar.xz
kernel-uprobes-aa49cdd93be6328113f0c146fc72be173d578d27.zip
e100: fix eeh on pseries during ethtool -t
Olaf Hering reported a problem on pseries with e100 where ethtool -t would cause a bus error, and the e100 driver would stop working. Due to the new load ucode command the cb list must be allocated before calling e100_init_hw, so remove the call and just let e100_up take care of it. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
-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;