mirror of
https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git
synced 2025-01-01 00:18:15 +01:00
Move the old iSCSI initiator source to a more appropriate place
(sys/dev/iscsi_initiator/ instead of sys/dev/iscsi/initiator/), to make room for the new one. This is also more logical location (kernel module being named iscsi_initiator.ko, for example). There is no ongoing work on this I know of, so it shouldn't make life harder for anyone. There are no functional changes, apart from "svn mv" and adjusting paths.
This commit is contained in:
parent
27eaacc76c
commit
9732e4fd92
@ -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
|
||||
|
@ -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"
|
||||
|
||||
/*
|
||||
|
@ -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 {
|
||||
|
@ -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
|
||||
|
@ -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[] = {
|
||||
|
@ -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
|
||||
|
@ -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);
|
||||
|
@ -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
|
||||
|
@ -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)
|
@ -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)
|
@ -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
|
@ -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");
|
||||
|
@ -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;
|
@ -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
|
@ -159,7 +159,7 @@ SUBDIR= \
|
||||
${_ipw} \
|
||||
${_ipwfw} \
|
||||
${_isci} \
|
||||
iscsi \
|
||||
iscsi_initiator \
|
||||
isp \
|
||||
${_ispfw} \
|
||||
${_iwi} \
|
||||
|
@ -1,6 +1,6 @@
|
||||
# $FreeBSD$
|
||||
|
||||
.PATH: ${.CURDIR}/../../../dev/iscsi/initiator
|
||||
.PATH: ${.CURDIR}/../../dev/iscsi_initiator
|
||||
KMOD=iscsi_initiator
|
||||
|
||||
SRCS= iscsi.h iscsivar.h
|
Loading…
Reference in New Issue
Block a user