1 files changed, 4 insertions, 14 deletions

diff --git a/drivers/scsi/bnx2fc/bnx2fc_els.c b/drivers/scsi/bnx2fc/bnx2fc_els.c
index ce0ce3e32f33..bdbbb13b8534 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_els.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_els.c
@@ -854,7 +854,6 @@ static void bnx2fc_flogi_resp(struct fc_seq *seq, struct fc_frame *fp,
         struct fc_exch *exch = fc_seq_exch(seq);
         struct fc_lport *lport = exch->lp;
         u8 *mac;
-        struct fc_frame_header *fh;
         u8 op;
 
         if (IS_ERR(fp))
@@ -862,13 +861,6 @@ static void bnx2fc_flogi_resp(struct fc_seq *seq, struct fc_frame *fp,
 
         mac = fr_cb(fp)->granted_mac;
         if (is_zero_ether_addr(mac)) {
-                fh = fc_frame_header_get(fp);
-                if (fh->fh_type != FC_TYPE_ELS) {
-                        printk(KERN_ERR PFX "bnx2fc_flogi_resp:"
-                                "fh_type != FC_TYPE_ELS\n");
-                        fc_frame_free(fp);
-                        return;
-                }
                 op = fc_frame_payload_op(fp);
                 if (lport->vport) {
                         if (op == ELS_LS_RJT) {
@@ -878,12 +870,10 @@ static void bnx2fc_flogi_resp(struct fc_seq *seq, struct fc_frame *fp,
                                 return;
                         }
                 }
-                if (fcoe_ctlr_recv_flogi(fip, lport, fp)) {
-                        fc_frame_free(fp);
-                        return;
-                }
+                fcoe_ctlr_recv_flogi(fip, lport, fp);
         }
-        fip->update_mac(lport, mac);
+        if (!is_zero_ether_addr(mac))
+                fip->update_mac(lport, mac);
 done:
         fc_lport_flogi_resp(seq, fp, lport);
 }
@@ -910,7 +900,7 @@ struct fc_seq *bnx2fc_elsct_send(struct fc_lport *lport, u32 did,
 {
         struct fcoe_port *port = lport_priv(lport);
         struct bnx2fc_interface *interface = port->priv;
-        struct fcoe_ctlr *fip = &interface->ctlr;
+        struct fcoe_ctlr *fip = bnx2fc_to_ctlr(interface);
         struct fc_frame_header *fh = fc_frame_header_get(fp);
 
         switch (op) {