aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Tomasz Napierala <trasz@FreeBSD.org>2016-05-17 15:21:17 +0000
committerEdward Tomasz Napierala <trasz@FreeBSD.org>2016-05-17 15:21:17 +0000
commit257cbe34102b99845e59647c62ebdd01ed680c9c (patch)
tree73417c93abf8dd693ea177d1015b6da646380e03
parent5f7b3969e97cb5d7e02ce7156f6fe097df82b5b5 (diff)
Notes
-rw-r--r--sys/conf/files2
-rw-r--r--sys/dev/iscsi/icl.h3
-rw-r--r--sys/dev/iscsi/icl_soft_proxy.c (renamed from sys/dev/iscsi/icl_proxy.c)0
-rw-r--r--sys/modules/iscsi/Makefile2
4 files changed, 4 insertions, 3 deletions
diff --git a/sys/conf/files b/sys/conf/files
index f549e1c2abfb..d9d58d79e717 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1629,8 +1629,8 @@ ipw_monitor.fw optional ipwmonitorfw | ipwfw \
clean "ipw_monitor.fw"
dev/iscsi/icl.c optional iscsi | ctl
dev/iscsi/icl_conn_if.m optional iscsi | ctl
-dev/iscsi/icl_proxy.c optional iscsi | ctl
dev/iscsi/icl_soft.c optional iscsi | ctl
+dev/iscsi/icl_soft_proxy.c optional iscsi | ctl
dev/iscsi/iscsi.c optional iscsi scbus
dev/iscsi_initiator/iscsi.c optional iscsi_initiator scbus
dev/iscsi_initiator/iscsi_subr.c optional iscsi_initiator scbus
diff --git a/sys/dev/iscsi/icl.h b/sys/dev/iscsi/icl.h
index 521ac8f387fc..735e5db96b44 100644
--- a/sys/dev/iscsi/icl.h
+++ b/sys/dev/iscsi/icl.h
@@ -150,7 +150,8 @@ int icl_listen_add(struct icl_listen *il, bool rdma,
int icl_listen_remove(struct icl_listen *il, struct sockaddr *sa);
/*
- * Those two are not a public API; only to be used between icl_soft.c and icl_proxy.c.
+ * Those two are not a public API; only to be used between icl_soft.c
+ * and icl_soft_proxy.c.
*/
int icl_soft_handoff_sock(struct icl_conn *ic, struct socket *so);
int icl_soft_proxy_connect(struct icl_conn *ic, int domain,
diff --git a/sys/dev/iscsi/icl_proxy.c b/sys/dev/iscsi/icl_soft_proxy.c
index f91bea3cdc47..f91bea3cdc47 100644
--- a/sys/dev/iscsi/icl_proxy.c
+++ b/sys/dev/iscsi/icl_soft_proxy.c
diff --git a/sys/modules/iscsi/Makefile b/sys/modules/iscsi/Makefile
index 74a971c92aae..1c88363d10ba 100644
--- a/sys/modules/iscsi/Makefile
+++ b/sys/modules/iscsi/Makefile
@@ -5,8 +5,8 @@ KMOD= iscsi
SRCS= iscsi.c
SRCS+= icl.c
-SRCS+= icl_proxy.c
SRCS+= icl_soft.c
+SRCS+= icl_soft_proxy.c
SRCS+= opt_cam.h
SRCS+= bus_if.h
SRCS+= device_if.h