From 6ffd2bb5a37e83f3bc0d2fa1c56a40fdd1e3ef01 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Fri, 15 Aug 2008 19:36:45 -0700 Subject: [PATCH] --- yaml --- r: 116698 b: refs/heads/master c: 16dbef4a831782466b10d4ae56837c5ba17d1948 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla2xxx/qla_def.h | 2 +- trunk/include/linux/pci.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4096b7a68e22..19768b7cdff9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0235c4fc7fc6f621dc0dd89eba102ad5aa373390 +refs/heads/master: 16dbef4a831782466b10d4ae56837c5ba17d1948 diff --git a/trunk/drivers/scsi/qla2xxx/qla_def.h b/trunk/drivers/scsi/qla2xxx/qla_def.h index 83c819216771..f25f41a499e5 100644 --- a/trunk/drivers/scsi/qla2xxx/qla_def.h +++ b/trunk/drivers/scsi/qla2xxx/qla_def.h @@ -2108,7 +2108,7 @@ struct scsi_qla_host; struct qla_msix_entry { int have_irq; - uint16_t msix_vector; + uint32_t msix_vector; uint16_t msix_entry; }; diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h index f7e7dbc09194..8a4d0bebc311 100644 --- a/trunk/include/linux/pci.h +++ b/trunk/include/linux/pci.h @@ -725,7 +725,7 @@ enum pci_dma_burst_strategy { }; struct msix_entry { - u16 vector; /* kernel uses to write allocated vector */ + u32 vector; /* kernel uses to write allocated vector */ u16 entry; /* driver uses to specify entry, OS writes */ };