aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 05989f130554..293188cbff8c 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);
513 **/ 513 **/
514void 514void
515fc_host_post_vendor_event(struct Scsi_Host *shost, u32 event_number, 515fc_host_post_vendor_event(struct Scsi_Host *shost, u32 event_number,
516 u32 data_len, char * data_buf, u32 vendor_id) 516 u32 data_len, char * data_buf, u64 vendor_id)
517{ 517{
518 struct sk_buff *skb; 518 struct sk_buff *skb;
519 struct nlmsghdr *nlh; 519 struct nlmsghdr *nlh;
diff --git a/include/scsi/scsi_netlink.h b/include/scsi/scsi_netlink.h
index 7a3a20e640c0..8c1470cc8209 100644
--- a/include/scsi/scsi_netlink.h
+++ b/include/scsi/scsi_netlink.h
@@ -67,9 +67,10 @@ struct scsi_nl_hdr {
67 * Identifiers for each type: 67 * Identifiers for each type:
68 * PCI : ID data is the 16 bit PCI Registered Vendor ID 68 * PCI : ID data is the 16 bit PCI Registered Vendor ID
69 */ 69 */
70#define SCSI_NL_VID_ID_MASK 0x00FFFFFF 70#define SCSI_NL_VID_TYPE_SHIFT 56
71#define SCSI_NL_VID_TYPE_MASK 0xFF000000 71#define SCSI_NL_VID_TYPE_MASK ((u64)0xFF << SCSI_NL_VID_TYPE_SHIFT)
72#define SCSI_NL_VID_TYPE_PCI 0x01000000 72#define SCSI_NL_VID_TYPE_PCI ((u64)0x01 << SCSI_NL_VID_TYPE_SHIFT)
73#define SCSI_NL_VID_ID_MASK (~ SCSI_NL_VID_TYPE_MASK)
73 74
74 75
75#define INIT_SCSI_NL_HDR(hdr, t, mtype, mlen) \ 76#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 b213d2909fed..cbf76e479761 100644
--- a/include/scsi/scsi_netlink_fc.h
+++ b/include/scsi/scsi_netlink_fc.h
@@ -58,7 +58,7 @@
58struct fc_nl_event { 58struct fc_nl_event {
59 struct scsi_nl_hdr snlh; /* must be 1st element ! */ 59 struct scsi_nl_hdr snlh; /* must be 1st element ! */
60 uint64_t seconds; 60 uint64_t seconds;
61 uint32_t vendor_id; 61 uint64_t vendor_id;
62 uint16_t host_no; 62 uint16_t host_no;
63 uint16_t event_datalen; 63 uint16_t event_datalen;
64 uint32_t event_num; 64 uint32_t event_num;
diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
index f91c5358af3a..0b11eff989e0 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);
555void fc_host_post_event(struct Scsi_Host *shost, u32 event_number, 555void fc_host_post_event(struct Scsi_Host *shost, u32 event_number,
556 enum fc_host_event_code event_code, u32 event_data); 556 enum fc_host_event_code event_code, u32 event_data);
557void fc_host_post_vendor_event(struct Scsi_Host *shost, u32 event_number, 557void fc_host_post_vendor_event(struct Scsi_Host *shost, u32 event_number,
558 u32 data_len, char * data_buf, u32 vendor_id); 558 u32 data_len, char * data_buf, u64 vendor_id);
559 /* Note: when specifying vendor_id to fc_host_post_vendor_event() 559 /* Note: when specifying vendor_id to fc_host_post_vendor_event()
560 * be sure to read the Vendor Type and ID formatting requirements 560 * be sure to read the Vendor Type and ID formatting requirements
561 * specified in scsi_netlink.h 561 * specified in scsi_netlink.h