svn commit: r315140 - stable/10/sys/dev/aic7xxx

[Alexander Motin]

Author: mav
Date: Sun Mar 12 06:20:28 2017
New Revision: 315140
URL: https://svnweb.freebsd.org/changeset/base/315140

Log:
  MFC r314308: Fix LUN enabling on wildcard target, as done by CTL.

Modified:
  stable/10/sys/dev/aic7xxx/aic79xx.c
  stable/10/sys/dev/aic7xxx/aic7xxx.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/aic7xxx/aic79xx.c
==============================================================================
--- stable/10/sys/dev/aic7xxx/aic79xx.c	Sun Mar 12 06:19:58 2017	(r315139)
+++ stable/10/sys/dev/aic7xxx/aic79xx.c	Sun Mar 12 06:20:28 2017	(r315140)
@@ -9927,7 +9927,8 @@ ahd_handle_en_lun(struct ahd_softc *ahd,
 		u_int	   our_id;
 
 		our_id = ahd->our_id;
-		if (ccb->ccb_h.target_id != our_id) {
+		if (ccb->ccb_h.target_id != our_id
+		 && ccb->ccb_h.target_id != CAM_TARGET_WILDCARD) {
 			if ((ahd->features & AHD_MULTI_TID) != 0
 		   	 && (ahd->flags & AHD_INITIATORROLE) != 0) {
 				/*

Modified: stable/10/sys/dev/aic7xxx/aic7xxx.c
==============================================================================
--- stable/10/sys/dev/aic7xxx/aic7xxx.c	Sun Mar 12 06:19:58 2017	(r315139)
+++ stable/10/sys/dev/aic7xxx/aic7xxx.c	Sun Mar 12 06:20:28 2017	(r315140)
@@ -7353,7 +7353,8 @@ ahc_handle_en_lun(struct ahc_softc *ahc,
 	else
 		our_id = ahc->our_id_b;
 
-	if (ccb->ccb_h.target_id != our_id) {
+	if (ccb->ccb_h.target_id != our_id
+	 && ccb->ccb_h.target_id != CAM_TARGET_WILDCARD) {
 		/*
 		 * our_id represents our initiator ID, or
 		 * the ID of the first target to have an