From 0ca40bff6c5041cdf647ca146893c61a26796c76 Mon Sep 17 00:00:00 2001 From: trasz Date: Sun, 31 Aug 2014 20:47:10 +0000 Subject: MFC r270282: Use proper include paths in kernel iSCSI code. Sponsored by: The FreeBSD Foundation --- sys/cam/ctl/ctl_frontend_iscsi.c | 6 +++--- sys/dev/iscsi/icl.c | 4 ++-- sys/dev/iscsi/icl_proxy.c | 2 +- sys/dev/iscsi/iscsi.c | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/cam/ctl/ctl_frontend_iscsi.c b/sys/cam/ctl/ctl_frontend_iscsi.c index 9b23713..d31370c 100644 --- a/sys/cam/ctl/ctl_frontend_iscsi.c +++ b/sys/cam/ctl/ctl_frontend_iscsi.c @@ -67,9 +67,9 @@ __FBSDID("$FreeBSD$"); #include #include -#include "../../dev/iscsi/icl.h" -#include "../../dev/iscsi/iscsi_proto.h" -#include "ctl_frontend_iscsi.h" +#include +#include +#include #ifdef ICL_KERNEL_PROXY #include diff --git a/sys/dev/iscsi/icl.c b/sys/dev/iscsi/icl.c index d3ac714..ede3938 100644 --- a/sys/dev/iscsi/icl.c +++ b/sys/dev/iscsi/icl.c @@ -58,8 +58,8 @@ __FBSDID("$FreeBSD$"); #include #include -#include "icl.h" -#include "iscsi_proto.h" +#include +#include SYSCTL_NODE(_kern, OID_AUTO, icl, CTLFLAG_RD, 0, "iSCSI Common Layer"); static int debug = 1; diff --git a/sys/dev/iscsi/icl_proxy.c b/sys/dev/iscsi/icl_proxy.c index d51fe5b..e014568 100644 --- a/sys/dev/iscsi/icl_proxy.c +++ b/sys/dev/iscsi/icl_proxy.c @@ -87,7 +87,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include "icl.h" +#include static int debug = 1; diff --git a/sys/dev/iscsi/iscsi.c b/sys/dev/iscsi/iscsi.c index 3d6191a..d958ee2 100644 --- a/sys/dev/iscsi/iscsi.c +++ b/sys/dev/iscsi/iscsi.c @@ -58,10 +58,10 @@ __FBSDID("$FreeBSD$"); #include #include -#include "iscsi_ioctl.h" -#include "iscsi.h" -#include "icl.h" -#include "iscsi_proto.h" +#include +#include +#include +#include #ifdef ICL_KERNEL_PROXY #include -- cgit v1.1