Author: davidcs
Date: Tue Dec 22 19:41:40 2015
New Revision: 292617
URL: https://svnweb.freebsd.org/changeset/base/292617
Log:
MFC r289635
ql_hw.c: fixed error code INJCT_HEARTBEAT_FAILURE
ql_os.c: removed unnecessary debug printf
ql_ver.h: updated version number
Modified:
stable/9/sys/dev/qlxgbe/ql_hw.c
stable/9/sys/dev/qlxgbe/ql_os.c
stable/9/sys/dev/qlxgbe/ql_ver.h
Directory Properties:
stable/9/ (props changed)
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/qlxgbe/ql_hw.c
==============================================================================
--- stable/9/sys/dev/qlxgbe/ql_hw.c Tue Dec 22 19:40:34 2015
(r292616)
+++ stable/9/sys/dev/qlxgbe/ql_hw.c Tue Dec 22 19:41:40 2015
(r292617)
@@ -387,6 +387,7 @@ ql_hw_add_sysctls(qla_host_t *ha)
"Minidump Utility can start minidump process");
#ifdef QL_DBG
+ ha->err_inject = 0;
SYSCTL_ADD_UINT(device_get_sysctl_ctx(dev),
SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
OID_AUTO, "err_inject",
@@ -3057,7 +3058,7 @@ ql_hw_check_health(qla_host_t *ha)
val = READ_REG32(ha, Q8_FIRMWARE_HEARTBEAT);
if ((val != ha->hw.hbeat_value) &&
- (!(QL_ERR_INJECT(ha, INJCT_TEMPERATURE_FAILURE)))) {
+ (!(QL_ERR_INJECT(ha, INJCT_HEARTBEAT_FAILURE)))) {
ha->hw.hbeat_value = val;
return 0;
}
Modified: stable/9/sys/dev/qlxgbe/ql_os.c
==============================================================================
--- stable/9/sys/dev/qlxgbe/ql_os.c Tue Dec 22 19:40:34 2015
(r292616)
+++ stable/9/sys/dev/qlxgbe/ql_os.c Tue Dec 22 19:41:40 2015
(r292617)
@@ -289,8 +289,6 @@ qla_pci_attach(device_t dev)
int i;
uint32_t num_rcvq = 0;
- QL_DPRINT2(ha, (dev, "%s: enter\n", __func__));
-
if ((ha = device_get_softc(dev)) == NULL) {
device_printf(dev, "cannot get softc\n");
return (ENOMEM);
Modified: stable/9/sys/dev/qlxgbe/ql_ver.h
==============================================================================
--- stable/9/sys/dev/qlxgbe/ql_ver.h Tue Dec 22 19:40:34 2015
(r292616)
+++ stable/9/sys/dev/qlxgbe/ql_ver.h Tue Dec 22 19:41:40 2015
(r292617)
@@ -36,6 +36,6 @@
#define QLA_VERSION_MAJOR 3
#define QLA_VERSION_MINOR 10
-#define QLA_VERSION_BUILD 24
+#define QLA_VERSION_BUILD 25
#endif /* #ifndef _QL_VER_H_ */
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
