I just didn't like the name, especially when I was looking at adding a second
transport_template for NPIV.

Signed-off-by: Chris Leech <[email protected]>
---

 drivers/scsi/fcoe/fcoe.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
index 86d8b23..e380dd2 100644
--- a/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@ -78,7 +78,7 @@ static struct notifier_block fcoe_notifier = {
        .notifier_call = fcoe_device_notification,
 };
 
-static struct scsi_transport_template *scsi_transport_fcoe_sw;
+static struct scsi_transport_template *fcoe_transport_template;
 
 struct fc_function_template fcoe_transport_function = {
        .show_host_node_name = 1,
@@ -438,7 +438,7 @@ static int fcoe_shost_config(struct fc_lport *lp, struct 
Scsi_Host *shost,
        lp->host->max_lun = FCOE_MAX_LUN;
        lp->host->max_id = FCOE_MAX_FCP_TARGET;
        lp->host->max_channel = 0;
-       lp->host->transportt = scsi_transport_fcoe_sw;
+       lp->host->transportt = fcoe_transport_template;
 
        /* add the new host to the SCSI-ml */
        rc = scsi_add_host(lp->host, dev);
@@ -673,10 +673,9 @@ out_host_put:
 static int __init fcoe_if_init(void)
 {
        /* attach to scsi transport */
-       scsi_transport_fcoe_sw =
-               fc_attach_transport(&fcoe_transport_function);
+       fcoe_transport_template = fc_attach_transport(&fcoe_transport_function);
 
-       if (!scsi_transport_fcoe_sw) {
+       if (!fcoe_transport_template) {
                printk(KERN_ERR "fcoe: Failed to attach to the FC transport\n");
                return -ENODEV;
        }
@@ -691,7 +690,7 @@ static int __init fcoe_if_init(void)
  */
 int __exit fcoe_if_exit(void)
 {
-       fc_release_transport(scsi_transport_fcoe_sw);
+       fc_release_transport(fcoe_transport_template);
        return 0;
 }
 

_______________________________________________
devel mailing list
[email protected]
http://www.open-fcoe.org/mailman/listinfo/devel

Reply via email to