diff options
| author | gibbs <gibbs@FreeBSD.org> | 1999-05-18 00:41:05 +0000 |
|---|---|---|
| committer | gibbs <gibbs@FreeBSD.org> | 1999-05-18 00:41:05 +0000 |
| commit | 2fde75e5f6e59b5fed505bd64a493848eb433244 (patch) | |
| tree | 0c0b301135eb0567acb509abee50a7e2085d3cfa /sys/cam | |
| parent | a83bfbcb2fb824e9238792da8c1b64761adf534d (diff) | |
| download | FreeBSD-src-2fde75e5f6e59b5fed505bd64a493848eb433244.zip FreeBSD-src-2fde75e5f6e59b5fed505bd64a493848eb433244.tar.gz | |
Make xpt_path_comp work on wildcarded paths again.
Diffstat (limited to 'sys/cam')
| -rw-r--r-- | sys/cam/cam_xpt.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c index 6bf427e..4f27724 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: cam_xpt.c,v 1.56 1999/05/11 02:41:00 mjacob Exp $ + * $Id: cam_xpt.c,v 1.57 1999/05/11 15:44:39 mjacob Exp $ */ #include <sys/param.h> #include <sys/systm.h> @@ -3778,22 +3778,22 @@ xpt_path_comp(struct cam_path *path1, struct cam_path *path2) int retval = 0; if (path1->bus != path2->bus) { - if ((path1->bus == NULL) - || (path2->bus == NULL)) + if (path1->bus->path_id == CAM_BUS_WILDCARD + || path2->bus->path_id == CAM_BUS_WILDCARD) retval = 1; else return (-1); } if (path1->target != path2->target) { - if ((path1->target == NULL) - || (path2->target == NULL)) + if (path1->target->target_id == CAM_TARGET_WILDCARD + || path2->target->target_id == CAM_TARGET_WILDCARD) retval = 1; else return (-1); } if (path1->device != path2->device) { - if ((path1->device == NULL) - || (path2->device == NULL)) + if (path1->device->lun_id == CAM_LUN_WILDCARD + || path2->device->lun_id == CAM_LUN_WILDCARD) retval = 1; else return (-1); |
