diff options
| -rw-r--r-- | sbin/iscontrol/auth_subr.c | 2 | ||||
| -rw-r--r-- | sbin/iscontrol/config.c | 2 | ||||
| -rw-r--r-- | sbin/iscontrol/fsm.c | 2 | ||||
| -rw-r--r-- | sbin/iscontrol/iscontrol.c | 2 | ||||
| -rw-r--r-- | sbin/iscontrol/login.c | 2 | ||||
| -rw-r--r-- | sbin/iscontrol/misc.c | 2 | ||||
| -rw-r--r-- | sbin/iscontrol/pdu.c | 2 | ||||
| -rw-r--r-- | sys/conf/files | 12 | ||||
| -rw-r--r-- | sys/dev/iscsi_initiator/isc_cam.c (renamed from sys/dev/iscsi/initiator/isc_cam.c) | 4 | ||||
| -rw-r--r-- | sys/dev/iscsi_initiator/isc_sm.c (renamed from sys/dev/iscsi/initiator/isc_sm.c) | 4 | ||||
| -rw-r--r-- | sys/dev/iscsi_initiator/isc_soc.c (renamed from sys/dev/iscsi/initiator/isc_soc.c) | 4 | ||||
| -rw-r--r-- | sys/dev/iscsi_initiator/isc_subr.c (renamed from sys/dev/iscsi/initiator/isc_subr.c) | 4 | ||||
| -rw-r--r-- | sys/dev/iscsi_initiator/iscsi.c (renamed from sys/dev/iscsi/initiator/iscsi.c) | 4 | ||||
| -rw-r--r-- | sys/dev/iscsi_initiator/iscsi.h (renamed from sys/dev/iscsi/initiator/iscsi.h) | 0 | ||||
| -rw-r--r-- | sys/dev/iscsi_initiator/iscsi_subr.c (renamed from sys/dev/iscsi/initiator/iscsi_subr.c) | 4 | ||||
| -rw-r--r-- | sys/dev/iscsi_initiator/iscsivar.h (renamed from sys/dev/iscsi/initiator/iscsivar.h) | 0 | ||||
| -rw-r--r-- | sys/modules/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/iscsi_initiator/Makefile (renamed from sys/modules/iscsi/initiator/Makefile) | 2 |
18 files changed, 27 insertions, 27 deletions
diff --git a/sbin/iscontrol/auth_subr.c b/sbin/iscontrol/auth_subr.c index 9ced1d7..5f82929 100644 --- a/sbin/iscontrol/auth_subr.c +++ b/sbin/iscontrol/auth_subr.c @@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$"); #include <md5.h> #include <sha.h> -#include <dev/iscsi/initiator/iscsi.h> +#include <dev/iscsi_initiator/iscsi.h> #include "iscontrol.h" static int diff --git a/sbin/iscontrol/config.c b/sbin/iscontrol/config.c index 6307f66..e8fd309 100644 --- a/sbin/iscontrol/config.c +++ b/sbin/iscontrol/config.c @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); #include <ctype.h> #include <camlib.h> -#include <dev/iscsi/initiator/iscsi.h> +#include <dev/iscsi_initiator/iscsi.h> #include "iscontrol.h" /* diff --git a/sbin/iscontrol/fsm.c b/sbin/iscontrol/fsm.c index 794fb8b..a4660bb 100644 --- a/sbin/iscontrol/fsm.c +++ b/sbin/iscontrol/fsm.c @@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$"); #include <stdarg.h> #include <camlib.h> -#include <dev/iscsi/initiator/iscsi.h> +#include <dev/iscsi_initiator/iscsi.h> #include "iscontrol.h" typedef enum { diff --git a/sbin/iscontrol/iscontrol.c b/sbin/iscontrol/iscontrol.c index c6ce21c..2e8f2ea 100644 --- a/sbin/iscontrol/iscontrol.c +++ b/sbin/iscontrol/iscontrol.c @@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$"); #include <unistd.h> #include <camlib.h> -#include <dev/iscsi/initiator/iscsi.h> +#include <dev/iscsi_initiator/iscsi.h> #include "iscontrol.h" static char version[] = "2.3.1"; // keep in sync with iscsi_initiator diff --git a/sbin/iscontrol/login.c b/sbin/iscontrol/login.c index 76937a8..92bbc64b 100644 --- a/sbin/iscontrol/login.c +++ b/sbin/iscontrol/login.c @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); #include <stdlib.h> #include <string.h> -#include <dev/iscsi/initiator/iscsi.h> +#include <dev/iscsi_initiator/iscsi.h> #include "iscontrol.h" static char *status_class1[] = { diff --git a/sbin/iscontrol/misc.c b/sbin/iscontrol/misc.c index 1f9dd12..b6fe6df 100644 --- a/sbin/iscontrol/misc.c +++ b/sbin/iscontrol/misc.c @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); #include <stdio.h> #include <string.h> -#include <dev/iscsi/initiator/iscsi.h> +#include <dev/iscsi_initiator/iscsi.h> #include "iscontrol.h" static inline char diff --git a/sbin/iscontrol/pdu.c b/sbin/iscontrol/pdu.c index c4d3a2a..7ce90ea 100644 --- a/sbin/iscontrol/pdu.c +++ b/sbin/iscontrol/pdu.c @@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$"); #include <stdarg.h> #include <camlib.h> -#include <dev/iscsi/initiator/iscsi.h> +#include <dev/iscsi_initiator/iscsi.h> #include "iscontrol.h" static void pukeText(char *it, pdu_t *pp); diff --git a/sys/conf/files b/sys/conf/files index c149fdd..6b811f3 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1521,12 +1521,12 @@ ipw_monitor.fw optional ipwmonitorfw | ipwfw \ compile-with "${NORMAL_FW}" \ no-obj no-implicit-rule \ clean "ipw_monitor.fw" -dev/iscsi/initiator/iscsi.c optional iscsi_initiator scbus -dev/iscsi/initiator/iscsi_subr.c optional iscsi_initiator scbus -dev/iscsi/initiator/isc_cam.c optional iscsi_initiator scbus -dev/iscsi/initiator/isc_soc.c optional iscsi_initiator scbus -dev/iscsi/initiator/isc_sm.c optional iscsi_initiator scbus -dev/iscsi/initiator/isc_subr.c optional iscsi_initiator scbus +dev/iscsi_initiator/iscsi.c optional iscsi_initiator scbus +dev/iscsi_initiator/iscsi_subr.c optional iscsi_initiator scbus +dev/iscsi_initiator/isc_cam.c optional iscsi_initiator scbus +dev/iscsi_initiator/isc_soc.c optional iscsi_initiator scbus +dev/iscsi_initiator/isc_sm.c optional iscsi_initiator scbus +dev/iscsi_initiator/isc_subr.c optional iscsi_initiator scbus dev/isf/isf.c optional isf dev/isf/isf_fdt.c optional isf fdt dev/isf/isf_nexus.c optional isf diff --git a/sys/dev/iscsi/initiator/isc_cam.c b/sys/dev/iscsi_initiator/isc_cam.c index ee0171c..c3ddd26 100644 --- a/sys/dev/iscsi/initiator/isc_cam.c +++ b/sys/dev/iscsi_initiator/isc_cam.c @@ -53,8 +53,8 @@ __FBSDID("$FreeBSD$"); #include <cam/cam_xpt_sim.h> #include <cam/cam_periph.h> -#include <dev/iscsi/initiator/iscsi.h> -#include <dev/iscsi/initiator/iscsivar.h> +#include <dev/iscsi_initiator/iscsi.h> +#include <dev/iscsi_initiator/iscsivar.h> static void _inq(struct cam_sim *sim, union ccb *ccb) diff --git a/sys/dev/iscsi/initiator/isc_sm.c b/sys/dev/iscsi_initiator/isc_sm.c index 7f47e9f..84f809a 100644 --- a/sys/dev/iscsi/initiator/isc_sm.c +++ b/sys/dev/iscsi_initiator/isc_sm.c @@ -62,8 +62,8 @@ __FBSDID("$FreeBSD$"); #include <cam/cam_xpt_sim.h> #include <cam/cam_periph.h> -#include <dev/iscsi/initiator/iscsi.h> -#include <dev/iscsi/initiator/iscsivar.h> +#include <dev/iscsi_initiator/iscsi.h> +#include <dev/iscsi_initiator/iscsivar.h> static void _async(isc_session_t *sp, pduq_t *pq) diff --git a/sys/dev/iscsi/initiator/isc_soc.c b/sys/dev/iscsi_initiator/isc_soc.c index 947aadc..94650fd 100644 --- a/sys/dev/iscsi/initiator/isc_soc.c +++ b/sys/dev/iscsi_initiator/isc_soc.c @@ -56,8 +56,8 @@ __FBSDID("$FreeBSD$"); #include <cam/cam.h> #include <cam/cam_ccb.h> -#include <dev/iscsi/initiator/iscsi.h> -#include <dev/iscsi/initiator/iscsivar.h> +#include <dev/iscsi_initiator/iscsi.h> +#include <dev/iscsi_initiator/iscsivar.h> #ifndef NO_USE_MBUF #define USE_MBUF diff --git a/sys/dev/iscsi/initiator/isc_subr.c b/sys/dev/iscsi_initiator/isc_subr.c index d7f0d27..677c5f1 100644 --- a/sys/dev/iscsi/initiator/isc_subr.c +++ b/sys/dev/iscsi_initiator/isc_subr.c @@ -55,8 +55,8 @@ __FBSDID("$FreeBSD$"); #include <sys/mbuf.h> #include <sys/libkern.h> -#include <dev/iscsi/initiator/iscsi.h> -#include <dev/iscsi/initiator/iscsivar.h> +#include <dev/iscsi_initiator/iscsi.h> +#include <dev/iscsi_initiator/iscsivar.h> static MALLOC_DEFINE(M_ISC, "iSC", "iSCSI driver options"); diff --git a/sys/dev/iscsi/initiator/iscsi.c b/sys/dev/iscsi_initiator/iscsi.c index 3737b7f..4dbf163 100644 --- a/sys/dev/iscsi/initiator/iscsi.c +++ b/sys/dev/iscsi_initiator/iscsi.c @@ -58,8 +58,8 @@ __FBSDID("$FreeBSD$"); #include <vm/uma.h> #include <sys/sx.h> -#include <dev/iscsi/initiator/iscsi.h> -#include <dev/iscsi/initiator/iscsivar.h> +#include <dev/iscsi_initiator/iscsi.h> +#include <dev/iscsi_initiator/iscsivar.h> static char *iscsi_driver_version = "2.3.1"; static struct isc_softc *isc; diff --git a/sys/dev/iscsi/initiator/iscsi.h b/sys/dev/iscsi_initiator/iscsi.h index 3142113..3142113 100644 --- a/sys/dev/iscsi/initiator/iscsi.h +++ b/sys/dev/iscsi_initiator/iscsi.h diff --git a/sys/dev/iscsi/initiator/iscsi_subr.c b/sys/dev/iscsi_initiator/iscsi_subr.c index 013b16e..b22ed83 100644 --- a/sys/dev/iscsi/initiator/iscsi_subr.c +++ b/sys/dev/iscsi_initiator/iscsi_subr.c @@ -53,8 +53,8 @@ __FBSDID("$FreeBSD$"); #include <cam/scsi/scsi_message.h> #include <sys/eventhandler.h> -#include <dev/iscsi/initiator/iscsi.h> -#include <dev/iscsi/initiator/iscsivar.h> +#include <dev/iscsi_initiator/iscsi.h> +#include <dev/iscsi_initiator/iscsivar.h> /* | Interface to the SCSI layer diff --git a/sys/dev/iscsi/initiator/iscsivar.h b/sys/dev/iscsi_initiator/iscsivar.h index 681ad70..681ad70 100644 --- a/sys/dev/iscsi/initiator/iscsivar.h +++ b/sys/dev/iscsi_initiator/iscsivar.h diff --git a/sys/modules/Makefile b/sys/modules/Makefile index bd263e9..b95c77b 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -159,7 +159,7 @@ SUBDIR= \ ${_ipw} \ ${_ipwfw} \ ${_isci} \ - iscsi \ + iscsi_initiator \ isp \ ${_ispfw} \ ${_iwi} \ diff --git a/sys/modules/iscsi/initiator/Makefile b/sys/modules/iscsi_initiator/Makefile index 3295c7b..0ae7aa4 100644 --- a/sys/modules/iscsi/initiator/Makefile +++ b/sys/modules/iscsi_initiator/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/iscsi/initiator +.PATH: ${.CURDIR}/../../dev/iscsi_initiator KMOD=iscsi_initiator SRCS= iscsi.h iscsivar.h |
