1 files changed, 10 insertions, 2 deletions

diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index b53b7ad999bc..4867837bc1be 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -279,6 +279,8 @@ static int myri10ge_fill_thresh = 256;
 module_param(myri10ge_fill_thresh, int, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(myri10ge_fill_thresh, "Number of empty rx slots allowed\n");
 
+static int myri10ge_reset_recover = 1;
+
 static int myri10ge_wcfifo = 0;
 module_param(myri10ge_wcfifo, int, S_IRUGO);
 MODULE_PARM_DESC(myri10ge_wcfifo, "Enable WC Fifo when WC is enabled\n");
@@ -2730,8 +2732,14 @@ static void myri10ge_watchdog(struct work_struct *work)
                  * For now, just report it */
                 reboot = myri10ge_read_reboot(mgp);
                 printk(KERN_ERR
-                       "myri10ge: %s: NIC rebooted (0x%x), resetting\n",
-                       mgp->dev->name, reboot);
+                       "myri10ge: %s: NIC rebooted (0x%x),%s resetting\n",
+                       mgp->dev->name, reboot,
+                       myri10ge_reset_recover ? " " : " not");
+                if (myri10ge_reset_recover == 0)
+                        return;
+
+                myri10ge_reset_recover--;
+
                 /*
                  * A rebooted nic will come back with config space as
                  * it was after power was applied to PCIe bus.