mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-05-02 18:17:50 -04:00
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI updates from James Bottomley: "Usual driver updates (ufs, mpi3mr, lpfc, pm80xx, mpt3sas) plus assorted cleanups and fixes. The only core update is to sd.c and is mostly cosmetic" * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (105 commits) scsi: MAINTAINERS: Update FC element owners scsi: mpt3sas: Update driver version to 54.100.00.00 scsi: mpt3sas: Add support for 22.5 Gbps SAS link rate scsi: mpt3sas: Suppress unnecessary IOCLogInfo on CONFIG_INVALID_PAGE scsi: mpt3sas: Fix crash in transport port remove by using ioc_info() scsi: ufs: ufs-qcom: Add support for limiting HS gear and rate scsi: ufs: pltfrm: Add DT support to limit HS gear and gear rate scsi: ufs: ufs-qcom: Remove redundant re-assignment to hs_rate scsi: ufs: dt-bindings: Document gear and rate limit properties scsi: ufs: core: Fix data race in CPU latency PM QoS request handling scsi: libfc: Fix potential buffer overflow in fc_ct_ms_fill() scsi: storvsc: Remove redundant ternary operators scsi: ufs: core: Change MCQ interrupt enable flow scsi: smartpqi: Replace kmalloc() + copy_from_user() with memdup_user() scsi: hpsa: Replace kmalloc() + copy_from_user() with memdup_user() scsi: hpsa: Fix potential memory leak in hpsa_big_passthru_ioctl() scsi: lpfc: Copyright updates for 14.4.0.11 patches scsi: lpfc: Update lpfc version to 14.4.0.11 scsi: lpfc: Convert debugfs directory counts from atomic to unsigned int scsi: lpfc: Clean up extraneous phba dentries ...
This commit is contained in:
@@ -11,6 +11,12 @@
|
||||
#include <linux/types.h>
|
||||
#include <asm/byteorder.h>
|
||||
|
||||
#ifdef __KERNEL__
|
||||
#include <linux/stddef.h> /* for offsetof */
|
||||
#else
|
||||
#include <stddef.h> /* for offsetof */
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Fibre Channel Switch - Enhanced Link Services definitions.
|
||||
* From T11 FC-LS Rev 1.2 June 7, 2005.
|
||||
@@ -1109,12 +1115,15 @@ struct fc_els_fpin {
|
||||
|
||||
/* Diagnostic Function Descriptor - FPIN Registration */
|
||||
struct fc_df_desc_fpin_reg {
|
||||
__be32 desc_tag; /* FPIN Registration (0x00030001) */
|
||||
__be32 desc_len; /* Length of Descriptor (in bytes).
|
||||
* Size of descriptor excluding
|
||||
* desc_tag and desc_len fields.
|
||||
*/
|
||||
__be32 count; /* Number of desc_tags elements */
|
||||
/* New members MUST be added within the __struct_group() macro below. */
|
||||
__struct_group(fc_df_desc_fpin_reg_hdr, __hdr, /* no attrs */,
|
||||
__be32 desc_tag; /* FPIN Registration (0x00030001) */
|
||||
__be32 desc_len; /* Length of Descriptor (in bytes).
|
||||
* Size of descriptor excluding
|
||||
* desc_tag and desc_len fields.
|
||||
*/
|
||||
__be32 count; /* Number of desc_tags elements */
|
||||
);
|
||||
__be32 desc_tags[]; /* Array of Descriptor Tags.
|
||||
* Each tag indicates a function
|
||||
* supported by the N_Port (request)
|
||||
@@ -1124,33 +1133,44 @@ struct fc_df_desc_fpin_reg {
|
||||
* See ELS_FN_DTAG_xxx for tag values.
|
||||
*/
|
||||
};
|
||||
_Static_assert(offsetof(struct fc_df_desc_fpin_reg, desc_tags) == sizeof(struct fc_df_desc_fpin_reg_hdr),
|
||||
"struct member likely outside of __struct_group()");
|
||||
|
||||
/*
|
||||
* ELS_RDF - Register Diagnostic Functions
|
||||
*/
|
||||
struct fc_els_rdf {
|
||||
__u8 fpin_cmd; /* command (0x19) */
|
||||
__u8 fpin_zero[3]; /* specified as zero - part of cmd */
|
||||
__be32 desc_len; /* Length of Descriptor List (in bytes).
|
||||
* Size of ELS excluding fpin_cmd,
|
||||
* fpin_zero and desc_len fields.
|
||||
*/
|
||||
/* New members MUST be added within the __struct_group() macro below. */
|
||||
__struct_group(fc_els_rdf_hdr, __hdr, /* no attrs */,
|
||||
__u8 fpin_cmd; /* command (0x19) */
|
||||
__u8 fpin_zero[3]; /* specified as zero - part of cmd */
|
||||
__be32 desc_len; /* Length of Descriptor List (in bytes).
|
||||
* Size of ELS excluding fpin_cmd,
|
||||
* fpin_zero and desc_len fields.
|
||||
*/
|
||||
);
|
||||
struct fc_tlv_desc desc[]; /* Descriptor list */
|
||||
};
|
||||
_Static_assert(offsetof(struct fc_els_rdf, desc) == sizeof(struct fc_els_rdf_hdr),
|
||||
"struct member likely outside of __struct_group()");
|
||||
|
||||
/*
|
||||
* ELS RDF LS_ACC Response.
|
||||
*/
|
||||
struct fc_els_rdf_resp {
|
||||
struct fc_els_ls_acc acc_hdr;
|
||||
__be32 desc_list_len; /* Length of response (in
|
||||
* bytes). Excludes acc_hdr
|
||||
* and desc_list_len fields.
|
||||
*/
|
||||
struct fc_els_lsri_desc lsri;
|
||||
/* New members MUST be added within the __struct_group() macro below. */
|
||||
__struct_group(fc_els_rdf_resp_hdr, __hdr, /* no attrs */,
|
||||
struct fc_els_ls_acc acc_hdr;
|
||||
__be32 desc_list_len; /* Length of response (in
|
||||
* bytes). Excludes acc_hdr
|
||||
* and desc_list_len fields.
|
||||
*/
|
||||
struct fc_els_lsri_desc lsri;
|
||||
);
|
||||
struct fc_tlv_desc desc[]; /* Supported Descriptor list */
|
||||
};
|
||||
|
||||
_Static_assert(offsetof(struct fc_els_rdf_resp, desc) == sizeof(struct fc_els_rdf_resp_hdr),
|
||||
"struct member likely outside of __struct_group()");
|
||||
|
||||
/*
|
||||
* Diagnostic Capability Descriptors for EDC ELS
|
||||
|
||||
Reference in New Issue
Block a user