--- linux-2.4/drivers/net/acenic.c.orig	2003-08-25 15:04:37.000000000 -0500
+++ linux-2.4/drivers/net/acenic.c	2003-08-25 15:05:25.000000000 -0500
@@ -67,6 +67,10 @@
 #include <linux/highmem.h>
 #include <linux/sockios.h>

+#ifdef CONFIG_PPC_PSERIES
+#include <asm/eeh.h>
+#endif
+
 #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
 #include <linux/if_vlan.h>
 #endif
@@ -1867,6 +1871,15 @@ static void ace_watchdog(struct net_devi
 		       dev->name);
 		netif_wake_queue(dev);
 	}
+
+#ifdef CONFIG_PPC_PSERIES
+	/* IBM pSeries (ppc64) has a feature called EEH, in which a slot is
+	 * frozen if the bridge detects a parity error or DMA access violation.
+	 * It's possible that the watchdog triggers because the slot got frozen,
+	 * verify that this is not the case.
+	 */
+	eeh_check_failure(regs, 0);
+#endif
 }