1 files changed, 5 insertions, 8 deletions

diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
index 61384ee4049b..cefbe44bb84a 100644
--- a/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@ -2347,14 +2347,11 @@ static void fcoe_flogi_resp(struct fc_seq *seq, struct fc_frame *fp, void *arg)
                 goto done;
 
         mac = fr_cb(fp)->granted_mac;
-        if (is_zero_ether_addr(mac)) {
-                /* pre-FIP */
-                if (fcoe_ctlr_recv_flogi(fip, lport, fp)) {
-                        fc_frame_free(fp);
-                        return;
-                }
-        }
-        fcoe_update_src_mac(lport, mac);
+        /* pre-FIP */
+        if (is_zero_ether_addr(mac))
+                fcoe_ctlr_recv_flogi(fip, lport, fp);
+        if (!is_zero_ether_addr(mac))
+                fcoe_update_src_mac(lport, mac);
 done:
         fc_lport_flogi_resp(seq, fp, lport);
 }