upgrade to linux 2.6.10-1.12_FC2

[linux-2.6.git] / include / scsi / scsi_transport_fc.h

diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
index 7495cee..2085903 100644 (file)
--- a/include/scsi/scsi_transport_fc.h
+++ b/include/scsi/scsi_transport_fc.h
@@ -29,7 +29,7 @@ struct fc_starget_attrs {     /* aka fc_target_attrs */
        uint64_t node_name;
        uint64_t port_name;
        uint32_t dev_loss_tmo;  /* Remote Port loss timeout in seconds. */
-       struct work_struct dev_loss_work;
+       struct timer_list dev_loss_timer;
 };
 
 #define fc_starget_port_id(x) \
@@ -40,18 +40,18 @@ struct fc_starget_attrs {   /* aka fc_target_attrs */
        (((struct fc_starget_attrs *)&(x)->starget_data)->port_name)
 #define fc_starget_dev_loss_tmo(x) \
        (((struct fc_starget_attrs *)&(x)->starget_data)->dev_loss_tmo)
-#define fc_starget_dev_loss_work(x) \
-       (((struct fc_starget_attrs *)&(x)->starget_data)->dev_loss_work)
+#define fc_starget_dev_loss_timer(x) \
+       (((struct fc_starget_attrs *)&(x)->starget_data)->dev_loss_timer)
 
 struct fc_host_attrs {
        uint32_t link_down_tmo; /* Link Down timeout in seconds. */
-       struct work_struct link_down_work;
+       struct timer_list link_down_timer;
 };
 
 #define fc_host_link_down_tmo(x) \
        (((struct fc_host_attrs *)(x)->shost_data)->link_down_tmo)
-#define fc_host_link_down_work(x) \
-       (((struct fc_host_attrs *)(x)->shost_data)->link_down_work)
+#define fc_host_link_down_timer(x) \
+       (((struct fc_host_attrs *)(x)->shost_data)->link_down_timer)
 
 
 /* The functions by which the transport class and the driver communicate */