Module Name: src
Committed By: martin
Date: Tue Aug 18 09:41:10 UTC 2020
Modified Files:
src/sys/arch/x86/x86 [netbsd-8]: ipmi.c
Log Message:
Pull up following revision(s) (requested by nonaka in ticket #1597):
sys/dev/ipmi.c: revision 1.5
(applied to sys/arch/x86/x86/ipmi.c)
ipmi(4): Fixed a bug that incorrect condition is notified.
When the value obtained from the sensor is below the lower limit of
the critical threshold, it is notified that the value is below the lower
limit of the warning threshold.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.64.10.1 src/sys/arch/x86/x86/ipmi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/ipmi.c
diff -u src/sys/arch/x86/x86/ipmi.c:1.64 src/sys/arch/x86/x86/ipmi.c:1.64.10.1
--- src/sys/arch/x86/x86/ipmi.c:1.64 Thu Jul 7 06:55:40 2016
+++ src/sys/arch/x86/x86/ipmi.c Tue Aug 18 09:41:10 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ipmi.c,v 1.64 2016/07/07 06:55:40 msaitoh Exp $ */
+/* $NetBSD: ipmi.c,v 1.64.10.1 2020/08/18 09:41:10 martin Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.64 2016/07/07 06:55:40 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.64.10.1 2020/08/18 09:41:10 martin Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -1667,14 +1667,14 @@ ipmi_sensor_status(struct ipmi_softc *sc
edata->value_cur > psensor->i_limits.sel_warnmax)
return ENVSYS_SWARNOVER;
- if (psensor->i_props & PROP_WARNMIN &&
- edata->value_cur < psensor->i_limits.sel_warnmin)
- return ENVSYS_SWARNUNDER;
-
if (psensor->i_props & PROP_CRITMIN &&
edata->value_cur < psensor->i_limits.sel_critmin)
return ENVSYS_SCRITUNDER;
+ if (psensor->i_props & PROP_WARNMIN &&
+ edata->value_cur < psensor->i_limits.sel_warnmin)
+ return ENVSYS_SWARNUNDER;
+
break;
case IPMI_SENSOR_TYPE_INTRUSION:
