diff options
| author | davidcs <davidcs@FreeBSD.org> | 2015-12-22 19:34:21 +0000 |
|---|---|---|
| committer | davidcs <davidcs@FreeBSD.org> | 2015-12-22 19:34:21 +0000 |
| commit | fe1c291a3e7044c5732dde826ed4c380024d361a (patch) | |
| tree | 19bccfc394c096b5305b2ef2527334ba75a160ad /sys/dev | |
| parent | 8af142a2e4e02c8158b1127c6baed535592af5c8 (diff) | |
| download | FreeBSD-src-fe1c291a3e7044c5732dde826ed4c380024d361a.zip FreeBSD-src-fe1c291a3e7044c5732dde826ed4c380024d361a.tar.gz | |
MFC r289635
ql_hw.c: fixed error code INJCT_HEARTBEAT_FAILURE
ql_os.c: removed unnecessary debug printf
ql_ver.h: updated version number
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/qlxgbe/ql_hw.c | 3 | ||||
| -rw-r--r-- | sys/dev/qlxgbe/ql_os.c | 2 | ||||
| -rw-r--r-- | sys/dev/qlxgbe/ql_ver.h | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/sys/dev/qlxgbe/ql_hw.c b/sys/dev/qlxgbe/ql_hw.c index 0e389d6..3efca30 100644 --- a/sys/dev/qlxgbe/ql_hw.c +++ b/sys/dev/qlxgbe/ql_hw.c @@ -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; } diff --git a/sys/dev/qlxgbe/ql_os.c b/sys/dev/qlxgbe/ql_os.c index ecc6cce..5190ff5 100644 --- a/sys/dev/qlxgbe/ql_os.c +++ b/sys/dev/qlxgbe/ql_os.c @@ -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); diff --git a/sys/dev/qlxgbe/ql_ver.h b/sys/dev/qlxgbe/ql_ver.h index 061e368..0d86db9 100644 --- a/sys/dev/qlxgbe/ql_ver.h +++ b/sys/dev/qlxgbe/ql_ver.h @@ -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_ */ |
