aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2006-08-09 11:46:30 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2006-08-09 11:46:30 -0700
commit54f58d6c4f15f3bdf15d43fa640ca6de9487f50e (patch)
tree5d6bab099bb8376528847ec37f162d218c7940b9 /drivers
parent897e11a40baf24224bd0edc948f908ed07c5675d (diff)
parent013b68bf7cb4edfb8753aac9bde3cb60c84bc067 (diff)
Merge branch 'upstream-greg' of gregkh@master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/myri10ge/myri10ge.c2
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 */