1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 30b1cca8144c..b9e1dc662363 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -64,8 +64,8 @@
 
 #define DRV_MODULE_NAME         "tg3"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "3.83"
-#define DRV_MODULE_RELDATE      "October 10, 2007"
+#define DRV_MODULE_VERSION      "3.84"
+#define DRV_MODULE_RELDATE      "October 12, 2007"
 
 #define TG3_DEF_MAC_MODE        0
 #define TG3_DEF_RX_MODE         0
@@ -5056,6 +5056,12 @@ static void tg3_restore_pci_state(struct tg3 *tp)
 
         pci_write_config_dword(tp->pdev, TG3PCI_COMMAND, tp->pci_cmd);
 
+        if (!(tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS)) {
+                pci_write_config_byte(tp->pdev, PCI_CACHE_LINE_SIZE,
+                                      tp->pci_cacheline_sz);
+                pci_write_config_byte(tp->pdev, PCI_LATENCY_TIMER,
+                                      tp->pci_lat_timer);
+        }
         /* Make sure PCI-X relaxed ordering bit is clear. */
         if (tp->pcix_cap) {
                 u16 pcix_cmd;