You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
60 lines
2.3 KiB
60 lines
2.3 KiB
15 years ago
|
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||
|
#
|
||
|
# Filename: package/.../linux-header/PATCHv2-1-4-scsi-consistent-use-of-__u8-in-scsi-scsi.h.patch
|
||
|
# Copyright (C) 2009 The OpenSDE Project
|
||
|
#
|
||
|
# More information can be found in the files COPYING and README.
|
||
|
#
|
||
|
# This patch file is dual-licensed. It is available under the license the
|
||
|
# patched project is licensed under, as long as it is an OpenSource license
|
||
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||
|
# of the GNU General Public License as published by the Free Software
|
||
|
# Foundation; either version 2 of the License, or (at your option) any later
|
||
|
# version.
|
||
|
# --- SDE-COPYRIGHT-NOTE-END ---
|
||
|
|
||
|
From patchwork Tue Sep 29 10:34:07 2009
|
||
|
Content-Type: text/plain; charset="utf-8"
|
||
|
MIME-Version: 1.0
|
||
|
Content-Transfer-Encoding: 8bit
|
||
|
Subject: [PATCHv2,1/4] scsi: consistent use of __u8 in scsi/scsi.h
|
||
|
Date: Tue, 29 Sep 2009 10:34:07 -0000
|
||
|
From: Michael S. Tsirkin <mst@redhat.com>
|
||
|
X-Patchwork-Id: 50527
|
||
|
|
||
|
scsi/scsi.h is exported to userspace, so it should
|
||
|
use __u8 instead of u8 as other userspace-visible headers do.
|
||
|
|
||
|
This fixes the following errors when application includes scsi/scsi.h
|
||
|
generated with make headers_install:
|
||
|
include/scsi/scsi.h:145: error: expected specifier-qualifier-list before ‘u8’
|
||
|
include/scsi/scsi.h: In function ‘scsi_varlen_cdb_length’:
|
||
|
include/scsi/scsi.h:156: error: ‘struct scsi_varlen_cdb_hdr’ has no member named ‘additional_cdb_length’
|
||
|
|
||
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
||
|
---
|
||
|
include/scsi/scsi.h | 8 ++++----
|
||
|
1 files changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
||
|
diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
|
||
|
index 084478e..dfcfaab 100644
|
||
|
--- a/include/scsi/scsi.h
|
||
|
+++ b/include/scsi/scsi.h
|
||
|
@@ -142,10 +142,10 @@ struct scsi_cmnd;
|
||
|
|
||
|
/* defined in T10 SCSI Primary Commands-2 (SPC2) */
|
||
|
struct scsi_varlen_cdb_hdr {
|
||
|
- u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */
|
||
|
- u8 control;
|
||
|
- u8 misc[5];
|
||
|
- u8 additional_cdb_length; /* total cdb length - 8 */
|
||
|
+ __u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */
|
||
|
+ __u8 control;
|
||
|
+ __u8 misc[5];
|
||
|
+ __u8 additional_cdb_length; /* total cdb length - 8 */
|
||
|
__be16 service_action;
|
||
|
/* service specific data follows */
|
||
|
};
|