ql_hw.c: fixed error code INJCT_HEARTBEAT_FAILURE

ql_os.c: removed unnecessary debug printf
ql_ver.h: updated version number
MFC after:5 days

diff --git a/sys/dev/qlxgbe/ql_hw.c b/sys/dev/qlxgbe/ql_hw.c
index d039aedcf4a66e21a8efea054f8a49ceb260fc38..3ae3f384f1bd6656c3f499cf25ec033962190d34 100644 (file)
--- 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 d46af57c8ca28792ceb7d3a13968b40a916ae6ec..8269b412784abfbe7f1a42178fa2a67d075924ea 100644 (file)
--- 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 061e368516e3c56f6dc5667be87674296a5602df..0d86db943efcb32390056b848a11a836b811040e 100644 (file)
--- 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_ */