3.16.61-rc1 review patch.  If anyone has any objections, please let me know.

------------------

From: Ben Hutchings <[email protected]>

Fix the compiler warning:

drivers/scsi/fnic/fnic_fcs.c:104:6: warning: this 'else' clause does not 
guard...

This was done upstream as part of commit 86001f248e94 "fnic: assign
FIP_ALL_FCF_MACS to fcoe_all_fcfs".

Signed-off-by: Ben Hutchings <[email protected]>
---
--- a/drivers/scsi/fnic/fnic_fcs.c
+++ b/drivers/scsi/fnic/fnic_fcs.c
@@ -101,13 +101,14 @@ void fnic_handle_link(struct work_struct
                                FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host,
                                             "link up\n");
                                fcoe_ctlr_link_up(&fnic->ctlr);
-                       } else
+                       } else {
                                /* UP -> UP */
                                spin_unlock_irqrestore(&fnic->fnic_lock, flags);
                                fnic_fc_trace_set_data(
                                        fnic->lport->host->host_no, FNIC_FC_LE,
                                        "Link Status: UP_UP",
                                        strlen("Link Status: UP_UP"));
+                       }
                }
        } else if (fnic->link_status) {
                /* DOWN -> UP */

Reply via email to