[SCSI] Merge up to linux-2.6 head
Conflicts: drivers/scsi/jazz_esp.c Same changes made by both SCSI and SPARC trees: problem with UTF-8 conversion in the copyright. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Esse commit está contido em:
@@ -436,7 +436,7 @@ typedef struct _MPT_SAS_MGMT {
|
||||
typedef struct _mpt_ioctl_events {
|
||||
u32 event; /* Specified by define above */
|
||||
u32 eventContext; /* Index or counter */
|
||||
int data[2]; /* First 8 bytes of Event Data */
|
||||
u32 data[2]; /* First 8 bytes of Event Data */
|
||||
} MPT_IOCTL_EVENTS;
|
||||
|
||||
/*
|
||||
|
@@ -2423,11 +2423,11 @@ mptscsih_copy_sense_data(struct scsi_cmnd *sc, MPT_SCSI_HOST *hd, MPT_FRAME_HDR
|
||||
ioc->events[idx].event = MPI_EVENT_SCSI_DEVICE_STATUS_CHANGE;
|
||||
ioc->events[idx].eventContext = ioc->eventContext;
|
||||
|
||||
ioc->events[idx].data[0] = (pReq->LUN[1] << 24) ||
|
||||
(MPI_EVENT_SCSI_DEV_STAT_RC_SMART_DATA << 16) ||
|
||||
(sc->device->channel << 8) || sc->device->id;
|
||||
ioc->events[idx].data[0] = (pReq->LUN[1] << 24) |
|
||||
(MPI_EVENT_SCSI_DEV_STAT_RC_SMART_DATA << 16) |
|
||||
(sc->device->channel << 8) | sc->device->id;
|
||||
|
||||
ioc->events[idx].data[1] = (sense_data[13] << 8) || sense_data[12];
|
||||
ioc->events[idx].data[1] = (sense_data[13] << 8) | sense_data[12];
|
||||
|
||||
ioc->eventContext++;
|
||||
if (hd->ioc->pcidev->vendor ==
|
||||
|
Referência em uma nova issue
Block a user