svn commit: r270891 - in stable/10/sys: cam/ctl dev/iscsi

[Edward Tomasz Napierala]

Author: trasz
Date: Sun Aug 31 20:47:10 2014
New Revision: 270891
URL: http://svnweb.freebsd.org/changeset/base/270891

Log:
  MFC r270282:
  
  Use proper include paths in kernel iSCSI code.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/sys/cam/ctl/ctl_frontend_iscsi.c
  stable/10/sys/dev/iscsi/icl.c
  stable/10/sys/dev/iscsi/icl_proxy.c
  stable/10/sys/dev/iscsi/iscsi.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cam/ctl/ctl_frontend_iscsi.c
==============================================================================
--- stable/10/sys/cam/ctl/ctl_frontend_iscsi.c	Sun Aug 31 20:34:06 2014	(r270890)
+++ stable/10/sys/cam/ctl/ctl_frontend_iscsi.c	Sun Aug 31 20:47:10 2014	(r270891)
@@ -67,9 +67,9 @@ __FBSDID("$FreeBSD$");
 #include <cam/ctl/ctl_ioctl.h>
 #include <cam/ctl/ctl_private.h>
 
-#include "../../dev/iscsi/icl.h"
-#include "../../dev/iscsi/iscsi_proto.h"
-#include "ctl_frontend_iscsi.h"
+#include <dev/iscsi/icl.h>
+#include <dev/iscsi/iscsi_proto.h>
+#include <cam/ctl/ctl_frontend_iscsi.h>
 
 #ifdef ICL_KERNEL_PROXY
 #include <sys/socketvar.h>

Modified: stable/10/sys/dev/iscsi/icl.c
==============================================================================
--- stable/10/sys/dev/iscsi/icl.c	Sun Aug 31 20:34:06 2014	(r270890)
+++ stable/10/sys/dev/iscsi/icl.c	Sun Aug 31 20:47:10 2014	(r270891)
@@ -58,8 +58,8 @@ __FBSDID("$FreeBSD$");
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 
-#include "icl.h"
-#include "iscsi_proto.h"
+#include <dev/iscsi/icl.h>
+#include <dev/iscsi/iscsi_proto.h>
 
 SYSCTL_NODE(_kern, OID_AUTO, icl, CTLFLAG_RD, 0, "iSCSI Common Layer");
 static int debug = 1;

Modified: stable/10/sys/dev/iscsi/icl_proxy.c
==============================================================================
--- stable/10/sys/dev/iscsi/icl_proxy.c	Sun Aug 31 20:34:06 2014	(r270890)
+++ stable/10/sys/dev/iscsi/icl_proxy.c	Sun Aug 31 20:47:10 2014	(r270891)
@@ -87,7 +87,7 @@ __FBSDID("$FreeBSD$");
 #include <linux/types.h>
 #include <rdma/rdma_cm.h>
 
-#include "icl.h"
+#include <dev/iscsi/icl.h>
 
 static int debug = 1;
 

Modified: stable/10/sys/dev/iscsi/iscsi.c
==============================================================================
--- stable/10/sys/dev/iscsi/iscsi.c	Sun Aug 31 20:34:06 2014	(r270890)
+++ stable/10/sys/dev/iscsi/iscsi.c	Sun Aug 31 20:47:10 2014	(r270891)
@@ -58,10 +58,10 @@ __FBSDID("$FreeBSD$");
 #include <cam/scsi/scsi_all.h>
 #include <cam/scsi/scsi_message.h>
 
-#include "iscsi_ioctl.h"
-#include "iscsi.h"
-#include "icl.h"
-#include "iscsi_proto.h"
+#include <dev/iscsi/icl.h>
+#include <dev/iscsi/iscsi_ioctl.h>
+#include <dev/iscsi/iscsi_proto.h>
+#include <dev/iscsi/iscsi.h>
 
 #ifdef ICL_KERNEL_PROXY
 #include <sys/socketvar.h>