]> err.no Git - linux-2.6/commitdiff
[PATCH] myri10ge: always re-enable dummy rdmas in myri10ge_resume
authorBrice Goglin <brice@myri.com>
Wed, 9 Aug 2006 04:07:53 +0000 (00:07 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 9 Aug 2006 04:12:47 +0000 (00:12 -0400)
Dummy RDMA are always enabled on device startup since commit
9a71db721a2cbb9921b929b2699ab181f5a3c6c0 (to work around buggy
PCIe chipsets which do not implement resending properly). But,
we also need to always re-enable them when resuming the device.

Signed-off-by: Brice Goglin <brice@myri.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
drivers/net/myri10ge/myri10ge.c

index 06440a86baef611f245a0f396a92be0adc74ff90..9bdd43ab3573afb5981b456d9a50b0a7a7c6ce73 100644 (file)
@@ -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 */