diff options
| author | Peter Dunlap <Peter.Dunlap@Sun.COM> | 2009-01-29 20:08:08 -0700 |
|---|---|---|
| committer | Peter Dunlap <Peter.Dunlap@Sun.COM> | 2009-01-29 20:08:08 -0700 |
| commit | 1a1a84a324206b6b1f5f704ab166c4ebf78aed76 (patch) | |
| tree | 725959a1ce1dd460418f02082eed20c95e046b5a /usr/src/cmd | |
| parent | d07477a6ee3505188baed057edf1676a863466d4 (diff) | |
| download | illumos-gate-1a1a84a324206b6b1f5f704ab166c4ebf78aed76.tar.gz | |
6795429 Virtually identical copies of iscsi_protocol.h live in two locations
Diffstat (limited to 'usr/src/cmd')
| -rw-r--r-- | usr/src/cmd/iscsi/iscsitgtd/iscsi_ffp.h | 8 | ||||
| -rw-r--r-- | usr/src/cmd/iscsiadm/iscsiadm.h | 4 | ||||
| -rw-r--r-- | usr/src/cmd/iscsiadm/iscsiadm_main.c | 4 | ||||
| -rw-r--r-- | usr/src/cmd/iscsiadm/sun_ima.c | 2 |
4 files changed, 10 insertions, 8 deletions
diff --git a/usr/src/cmd/iscsi/iscsitgtd/iscsi_ffp.h b/usr/src/cmd/iscsi/iscsitgtd/iscsi_ffp.h index ae84910a99..3b17fd3e9c 100644 --- a/usr/src/cmd/iscsi/iscsitgtd/iscsi_ffp.h +++ b/usr/src/cmd/iscsi/iscsitgtd/iscsi_ffp.h @@ -20,15 +20,13 @@ */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #ifndef _FEATURE_H #define _FEATURE_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #include "iscsi_conn.h" @@ -40,4 +38,8 @@ Boolean_t iscsi_full_feature(iscsi_conn_t *c); +uint32_t iscsi_crc32c(void *address, unsigned long length); +uint32_t iscsi_crc32c_continued(void *address, unsigned long length, + uint32_t crc); + #endif /* _FEATURE_H */ diff --git a/usr/src/cmd/iscsiadm/iscsiadm.h b/usr/src/cmd/iscsiadm/iscsiadm.h index 5d7d685038..1a80ea0385 100644 --- a/usr/src/cmd/iscsiadm/iscsiadm.h +++ b/usr/src/cmd/iscsiadm/iscsiadm.h @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -30,7 +30,7 @@ extern "C" { #endif -#include <sys/scsi/adapters/iscsi_protocol.h> +#include <sys/iscsi_protocol.h> #include <sys/scsi/adapters/iscsi_if.h> #include <ima.h> diff --git a/usr/src/cmd/iscsiadm/iscsiadm_main.c b/usr/src/cmd/iscsiadm/iscsiadm_main.c index 8cc9a851a4..808b6323a5 100644 --- a/usr/src/cmd/iscsiadm/iscsiadm_main.c +++ b/usr/src/cmd/iscsiadm/iscsiadm_main.c @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -45,7 +45,7 @@ #include <assert.h> #include <ima.h> -#include <sys/scsi/adapters/iscsi_protocol.h> +#include <sys/iscsi_protocol.h> #include <sys/scsi/adapters/iscsi_if.h> #include "cmdparse.h" diff --git a/usr/src/cmd/iscsiadm/sun_ima.c b/usr/src/cmd/iscsiadm/sun_ima.c index 61e3fd7867..c2f239556a 100644 --- a/usr/src/cmd/iscsiadm/sun_ima.c +++ b/usr/src/cmd/iscsiadm/sun_ima.c @@ -40,7 +40,7 @@ #include <libdevinfo.h> #include <sys/scsi/adapters/iscsi_if.h> -#include <sys/scsi/adapters/iscsi_protocol.h> +#include <sys/iscsi_protocol.h> #include <ima.h> #include "iscsiadm.h" #include "sun_ima.h" |