diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-08-10 08:31:03 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-08-10 08:31:03 -0400 |
commit | f5c7db1c915ddad32deda2afcdf7ecf1d84fc8fd (patch) | |
tree | c62f64f0c7e446cd11a2092fd101e75a1cfa38a2 /drivers/net/myri10ge/myri10ge.c | |
parent | e714d99cacac976deac3239c89f2c9e3125649b6 (diff) | |
parent | 8d3d35b4e20dc2e678fc7cb51165905b5a32fb76 (diff) |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'drivers/net/myri10ge/myri10ge.c')
-rw-r--r-- | drivers/net/myri10ge/myri10ge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c index 06440a86bae..9bdd43ab357 100644 --- a/drivers/net/myri10ge/myri10ge.c +++ b/drivers/net/myri10ge/myri10ge.c @@ -2425,7 +2425,7 @@ static int myri10ge_resume(struct pci_dev *pdev) } myri10ge_reset(mgp); - myri10ge_dummy_rdma(mgp, mgp->tx.boundary != 4096); + myri10ge_dummy_rdma(mgp, 1); /* Save configuration space to be restored if the * nic resets due to a parity error */ |