summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Smart <James.Smart@Emulex.Com>2006-08-22 09:55:23 -0400
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-09-02 15:35:15 -0500
commitf14e2e29cdd07f80de6dec168dc2bb39de37eec3 (patch)
tree51f761e90b38f6ec8e6b9fc452f6184df71ebea0
parent84314fd4740ad73550c76dee4a9578979d84af48 (diff)
downloadop-kernel-dev-f14e2e29cdd07f80de6dec168dc2bb39de37eec3.zip
op-kernel-dev-f14e2e29cdd07f80de6dec168dc2bb39de37eec3.tar.gz
[SCSI] SCSI & FC transport: extend event vendor id's to 64bits
During discussions with Mike Christie, I became convinced that we needed a larger vendor id. This patch extends the id from 32 to 64 bits. This applies on top of the prior patches that add SCSI transport events via netlink. Signed-off-by: James Smart <James.Smart@emulex.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
-rw-r--r--drivers/scsi/scsi_transport_fc.c2
-rw-r--r--include/scsi/scsi_netlink.h7
-rw-r--r--include/scsi/scsi_netlink_fc.h2
-rw-r--r--include/scsi/scsi_transport_fc.h2
4 files changed, 7 insertions, 6 deletions
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index 05989f1..293188c 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -513,7 +513,7 @@ EXPORT_SYMBOL(fc_host_post_event);
**/
void
fc_host_post_vendor_event(struct Scsi_Host *shost, u32 event_number,
- u32 data_len, char * data_buf, u32 vendor_id)
+ u32 data_len, char * data_buf, u64 vendor_id)
{
struct sk_buff *skb;
struct nlmsghdr *nlh;
diff --git a/include/scsi/scsi_netlink.h b/include/scsi/scsi_netlink.h
index 7a3a20e..8c1470c 100644
--- a/include/scsi/scsi_netlink.h
+++ b/include/scsi/scsi_netlink.h
@@ -67,9 +67,10 @@ struct scsi_nl_hdr {
* Identifiers for each type:
* PCI : ID data is the 16 bit PCI Registered Vendor ID
*/
-#define SCSI_NL_VID_ID_MASK 0x00FFFFFF
-#define SCSI_NL_VID_TYPE_MASK 0xFF000000
-#define SCSI_NL_VID_TYPE_PCI 0x01000000
+#define SCSI_NL_VID_TYPE_SHIFT 56
+#define SCSI_NL_VID_TYPE_MASK ((u64)0xFF << SCSI_NL_VID_TYPE_SHIFT)
+#define SCSI_NL_VID_TYPE_PCI ((u64)0x01 << SCSI_NL_VID_TYPE_SHIFT)
+#define SCSI_NL_VID_ID_MASK (~ SCSI_NL_VID_TYPE_MASK)
#define INIT_SCSI_NL_HDR(hdr, t, mtype, mlen) \
diff --git a/include/scsi/scsi_netlink_fc.h b/include/scsi/scsi_netlink_fc.h
index b213d29..cbf76e4 100644
--- a/include/scsi/scsi_netlink_fc.h
+++ b/include/scsi/scsi_netlink_fc.h
@@ -58,7 +58,7 @@
struct fc_nl_event {
struct scsi_nl_hdr snlh; /* must be 1st element ! */
uint64_t seconds;
- uint32_t vendor_id;
+ uint64_t vendor_id;
uint16_t host_no;
uint16_t event_datalen;
uint32_t event_num;
diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
index f91c535..0b11eff 100644
--- a/include/scsi/scsi_transport_fc.h
+++ b/include/scsi/scsi_transport_fc.h
@@ -555,7 +555,7 @@ u32 fc_get_event_number(void);
void fc_host_post_event(struct Scsi_Host *shost, u32 event_number,
enum fc_host_event_code event_code, u32 event_data);
void fc_host_post_vendor_event(struct Scsi_Host *shost, u32 event_number,
- u32 data_len, char * data_buf, u32 vendor_id);
+ u32 data_len, char * data_buf, u64 vendor_id);
/* Note: when specifying vendor_id to fc_host_post_vendor_event()
* be sure to read the Vendor Type and ID formatting requirements
* specified in scsi_netlink.h
OpenPOWER on IntegriCloud