Limit the number of recoveries from a NIC hw watchdog reset to 1 by default. This is tweakable via the myri10ge_reset_recover tunable.
Signed-off-by: Brice Goglin <[EMAIL PROTECTED]> --- drivers/net/myri10ge/myri10ge.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) Index: linux-git/drivers/net/myri10ge/myri10ge.c =================================================================== --- linux-git.orig/drivers/net/myri10ge/myri10ge.c 2007-05-07 23:21:27.000000000 +0200 +++ linux-git/drivers/net/myri10ge/myri10ge.c 2007-05-07 23:21:45.000000000 +0200 @@ -279,6 +279,11 @@ 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; +module_param(myri10ge_reset_recover, int, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(myri10ge_reset_recover, + "Number of recoveries allowed from NIC hw reset\n"); + 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"); @@ -2706,8 +2711,14 @@ * 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. - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html