Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 22 Dec 2015 19:34:21 +0000 (UTC)
From:      David C Somayajulu <davidcs@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r292615 - stable/10/sys/dev/qlxgbe
Message-ID:  <201512221934.tBMJYL6G027238@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: davidcs
Date: Tue Dec 22 19:34:21 2015
New Revision: 292615
URL: https://svnweb.freebsd.org/changeset/base/292615

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/10/sys/dev/qlxgbe/ql_hw.c
  stable/10/sys/dev/qlxgbe/ql_os.c
  stable/10/sys/dev/qlxgbe/ql_ver.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/qlxgbe/ql_hw.c
==============================================================================
--- stable/10/sys/dev/qlxgbe/ql_hw.c	Tue Dec 22 18:39:07 2015	(r292614)
+++ stable/10/sys/dev/qlxgbe/ql_hw.c	Tue Dec 22 19:34:21 2015	(r292615)
@@ -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/10/sys/dev/qlxgbe/ql_os.c
==============================================================================
--- stable/10/sys/dev/qlxgbe/ql_os.c	Tue Dec 22 18:39:07 2015	(r292614)
+++ stable/10/sys/dev/qlxgbe/ql_os.c	Tue Dec 22 19:34:21 2015	(r292615)
@@ -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/10/sys/dev/qlxgbe/ql_ver.h
==============================================================================
--- stable/10/sys/dev/qlxgbe/ql_ver.h	Tue Dec 22 18:39:07 2015	(r292614)
+++ stable/10/sys/dev/qlxgbe/ql_ver.h	Tue Dec 22 19:34:21 2015	(r292615)
@@ -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_ */

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512221934.tBMJYL6G027238>