From 3c0927ad89ab5799e988bd8e69b546e779348f4a Mon Sep 17 00:00:00 2001 From: Vikas Chaudhary Date: Fri, 2 Mar 2012 01:55:31 -0800 Subject: [PATCH] --- yaml --- r: 298263 b: refs/heads/master c: e16d166e4f931cd735e5bac1a1affe7db09a8ea7 h: refs/heads/master i: 298261: db32f042dc1f0353ae03d11cab0dcb2aaf603773 298259: e3cdee3c6a34bd05dc4a4d1f54f314e7105fb8d6 298255: 6430fca4f9b5113606ccebc342793bda4e35e95e v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla4xxx/ql4_os.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ef5298f767cd..2d3acaa66936 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c743e44fbb1f8668941e83de07662b1ecd33d083 +refs/heads/master: e16d166e4f931cd735e5bac1a1affe7db09a8ea7 diff --git a/trunk/drivers/scsi/qla4xxx/ql4_os.c b/trunk/drivers/scsi/qla4xxx/ql4_os.c index 3d9419460e0c..4c2f88465597 100644 --- a/trunk/drivers/scsi/qla4xxx/ql4_os.c +++ b/trunk/drivers/scsi/qla4xxx/ql4_os.c @@ -834,7 +834,7 @@ static enum blk_eh_timer_return qla4xxx_eh_cmd_timed_out(struct scsi_cmnd *sc) static void qla4xxx_set_port_speed(struct Scsi_Host *shost) { struct scsi_qla_host *ha = to_qla_host(shost); - struct iscsi_cls_host *ihost = shost_priv(shost); + struct iscsi_cls_host *ihost = shost->shost_data; uint32_t speed = ISCSI_PORT_SPEED_UNKNOWN; qla4xxx_get_firmware_state(ha); @@ -859,7 +859,7 @@ static void qla4xxx_set_port_speed(struct Scsi_Host *shost) static void qla4xxx_set_port_state(struct Scsi_Host *shost) { struct scsi_qla_host *ha = to_qla_host(shost); - struct iscsi_cls_host *ihost = shost_priv(shost); + struct iscsi_cls_host *ihost = shost->shost_data; uint32_t state = ISCSI_PORT_STATE_DOWN; if (test_bit(AF_LINK_UP, &ha->flags))