wok diff linux-api-headers/stuff/scsi.patch @ rev 7111

Fixed get-linux-source script again in linux-source (i hope). Fixed path for url file.
author Christopher Rogers <slaxemulator@gmail.com>
date Wed Nov 03 20:09:13 2010 +0000 (2010-11-03)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/linux-api-headers/stuff/scsi.patch	Wed Nov 03 20:09:13 2010 +0000
     1.3 @@ -0,0 +1,42 @@
     1.4 +diff -Naur linux-2.6.32-old/include/scsi/scsi.h linux-2.6.32/include/scsi/scsi.h
     1.5 +--- linux-2.6.32-old/include/scsi/scsi.h	2009-12-03 13:51:21.000000000 +1000
     1.6 ++++ linux-2.6.32/include/scsi/scsi.h	2009-12-12 10:43:11.000000000 +1000
     1.7 +@@ -145,14 +145,15 @@
     1.8 + 
     1.9 + /* defined in T10 SCSI Primary Commands-2 (SPC2) */
    1.10 + struct scsi_varlen_cdb_hdr {
    1.11 +-	u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
    1.12 +-	u8 control;
    1.13 +-	u8 misc[5];
    1.14 +-	u8 additional_cdb_length;         /* total cdb length - 8 */
    1.15 ++	__u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
    1.16 ++	__u8 control;
    1.17 ++	__u8 misc[5];
    1.18 ++	__u8 additional_cdb_length;         /* total cdb length - 8 */
    1.19 + 	__be16 service_action;
    1.20 + 	/* service specific data follows */
    1.21 + };
    1.22 + 
    1.23 ++#ifdef __KERNEL__
    1.24 + static inline unsigned
    1.25 + scsi_varlen_cdb_length(const void *hdr)
    1.26 + {
    1.27 +@@ -168,6 +169,7 @@
    1.28 + 	return (cmnd[0] == VARIABLE_LENGTH_CMD) ?
    1.29 + 		scsi_varlen_cdb_length(cmnd) : COMMAND_SIZE(cmnd[0]);
    1.30 + }
    1.31 ++#endif
    1.32 + 
    1.33 + /*
    1.34 +  *  SCSI Architecture Model (SAM) Status codes. Taken from SAM-3 draft
    1.35 +@@ -284,8 +286,10 @@
    1.36 + 	SCSI_PROTOCOL_UNSPEC = 0xf, /* No specific protocol */
    1.37 + };
    1.38 + 
    1.39 ++#ifdef __KERNEL__
    1.40 + /* Returns a human-readable name for the device */
    1.41 + extern const char * scsi_device_type(unsigned type);
    1.42 ++#endif
    1.43 + 
    1.44 + /*
    1.45 +  * standard mode-select header prepended to all mode-select commands