git: e3500c602b13 - main - ipmi: fix negative logic in watchdog control flag

[Wojciech Macek]

The branch main has been updated by wma:

URL: https://cgit.FreeBSD.org/src/commit/?id=e3500c602b13f8252eb8bb779849c41d47306cee

commit e3500c602b13f8252eb8bb779849c41d47306cee
Author:     Wojciech Macek <wma at FreeBSD.org>
AuthorDate: 2021-08-18 06:21:14 +0000
Commit:     Wojciech Macek <wma at FreeBSD.org>
CommitDate: 2021-08-18 06:21:14 +0000

    ipmi: fix negative logic in watchdog control flag
    
    Use wd_enable instead of wd_disable
---
 sys/dev/ipmi/ipmi.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/dev/ipmi/ipmi.c b/sys/dev/ipmi/ipmi.c
index 77fd4b68ae96..77baf652b4bc 100644
--- a/sys/dev/ipmi/ipmi.c
+++ b/sys/dev/ipmi/ipmi.c
@@ -96,14 +96,14 @@ static int wd_shutdown_countdown = 0; /* sec */
 static int wd_startup_countdown = 0; /* sec */
 static int wd_pretimeout_countdown = 120; /* sec */
 static int cycle_wait = 10; /* sec */
-static int wd_init_disable = 0;
+static int wd_init_enable = 1;
 
 static SYSCTL_NODE(_hw, OID_AUTO, ipmi, CTLFLAG_RD | CTLFLAG_MPSAFE, 0,
     "IPMI driver parameters");
 SYSCTL_INT(_hw_ipmi, OID_AUTO, on, CTLFLAG_RWTUN,
 	&on, 0, "");
-SYSCTL_INT(_hw_ipmi, OID_AUTO, wd_init_disable, CTLFLAG_RWTUN,
-	&wd_init_disable, 0, "");
+SYSCTL_INT(_hw_ipmi, OID_AUTO, wd_init_enable, CTLFLAG_RWTUN,
+	&wd_init_enable, 1, "Enable watchdog initialization");
 SYSCTL_INT(_hw_ipmi, OID_AUTO, wd_timer_actions, CTLFLAG_RW,
 	&wd_timer_actions, 0,
 	"IPMI watchdog timer actions (including pre-timeout interrupt)");
@@ -912,7 +912,7 @@ ipmi_startup(void *arg)
 	 * Probe for watchdog, but only for backends which support
 	 * polled driver requests.
 	 */
-	if (!wd_init_disable && sc->ipmi_driver_requests_polled) {
+	if (wd_init_enable && sc->ipmi_driver_requests_polled) {
 		IPMI_INIT_DRIVER_REQUEST(req, IPMI_ADDR(IPMI_APP_REQUEST, 0),
 		    IPMI_GET_WDOG, 0, 0);