From f0f536d1aec2e5e9e81de1bf696c6d306e5c92fe Mon Sep 17 00:00:00 2001
From: Matt Jacob <mjacob@FreeBSD.org>
Date: Fri, 4 Aug 2006 20:14:03 +0000
Subject: [PATCH] Rename ioctl driven task management functions so they don't
 collide with task management definitions on other platforms.

---
 sys/dev/isp/isp_freebsd.c | 10 +++++-----
 sys/dev/isp/isp_ioctl.h   |  6 +++++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/sys/dev/isp/isp_freebsd.c b/sys/dev/isp/isp_freebsd.c
index e71e302141d4..620d99230810 100644
--- a/sys/dev/isp/isp_freebsd.c
+++ b/sys/dev/isp/isp_freebsd.c
@@ -562,29 +562,29 @@ ispioctl(_DEV dev, u_long c, caddr_t addr, int flags, _IOP *td)
 			loopid <<= 8;
 		}
 		switch (fct->action) {
-		case CLEAR_ACA:
+		case IPT_CLEAR_ACA:
 			mbs.param[0] = MBOX_CLEAR_ACA;
 			mbs.param[1] = loopid;
 			mbs.param[2] = fct->lun;
 			break;
-		case TARGET_RESET:
+		case IPT_TARGET_RESET:
 			mbs.param[0] = MBOX_TARGET_RESET;
 			mbs.param[1] = loopid;
 			needmarker = 1;
 			break;
-		case LUN_RESET:
+		case IPT_LUN_RESET:
 			mbs.param[0] = MBOX_LUN_RESET;
 			mbs.param[1] = loopid;
 			mbs.param[2] = fct->lun;
 			needmarker = 1;
 			break;
-		case CLEAR_TASK_SET:
+		case IPT_CLEAR_TASK_SET:
 			mbs.param[0] = MBOX_CLEAR_TASK_SET;
 			mbs.param[1] = loopid;
 			mbs.param[2] = fct->lun;
 			needmarker = 1;
 			break;
-		case ABORT_TASK_SET:
+		case IPT_ABORT_TASK_SET:
 			mbs.param[0] = MBOX_ABORT_TASK_SET;
 			mbs.param[1] = loopid;
 			mbs.param[2] = fct->lun;
diff --git a/sys/dev/isp/isp_ioctl.h b/sys/dev/isp/isp_ioctl.h
index d1f3f6754f0c..75ca4064cd4e 100644
--- a/sys/dev/isp/isp_ioctl.h
+++ b/sys/dev/isp/isp_ioctl.h
@@ -188,7 +188,11 @@ struct isp_fc_tsk_mgmt {
 	uint32_t	loopid;		/* 0..255 */
 	uint32_t	lun;
 	enum {
-	    CLEAR_ACA, TARGET_RESET, LUN_RESET, CLEAR_TASK_SET, ABORT_TASK_SET
+		IPT_CLEAR_ACA,
+		IPT_TARGET_RESET,
+		IPT_LUN_RESET,
+		IPT_CLEAR_TASK_SET,
+		IPT_ABORT_TASK_SET
 	} action;
 };
 #define	ISP_TSK_MGMT		_IOWR(ISP_IOC, 97, struct isp_fc_tsk_mgmt)