svn commit: r304737 - stable/10/sys/cam/ctl

[Alexander Motin]

Author: mav
Date: Wed Aug 24 07:50:28 2016
New Revision: 304737
URL: https://svnweb.freebsd.org/changeset/base/304737

Log:
  Fix HA mode configuration on FreeBSD 10.x.
  
  This is direct commit, compensating CTLFLAG_RDTUN difference between
  FreeBSD 10.x and 11.x branches.

Modified:
  stable/10/sys/cam/ctl/ctl.c

Modified: stable/10/sys/cam/ctl/ctl.c
==============================================================================
--- stable/10/sys/cam/ctl/ctl.c	Wed Aug 24 06:22:53 2016	(r304736)
+++ stable/10/sys/cam/ctl/ctl.c	Wed Aug 24 07:50:28 2016	(r304737)
@@ -1818,6 +1818,7 @@ ctl_init(void)
 	    NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0);
 	softc->flags = 0;
 
+	TUNABLE_INT_FETCH("kern.cam.ctl.ha_mode", (int *)&softc->ha_mode);
 	SYSCTL_ADD_INT(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree),
 	    OID_AUTO, "ha_mode", CTLFLAG_RDTUN, (int *)&softc->ha_mode, 0,
 	    "HA mode (0 - act/stby, 1 - serialize only, 2 - xfer)");
@@ -1827,6 +1828,7 @@ ctl_init(void)
 	 * figured out through the slot the controller is in.  Although it
 	 * is an active/active system, someone has to be in charge.
 	 */
+	TUNABLE_INT_FETCH("kern.cam.ctl.ha_id", &softc->ha_id);
 	SYSCTL_ADD_INT(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree),
 	    OID_AUTO, "ha_id", CTLFLAG_RDTUN, &softc->ha_id, 0,
 	    "HA head ID (0 - no HA)");