Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (77 commits)
  [SCSI] fix crash in scsi_dispatch_cmd()
  [SCSI] sr: check_events() ignore GET_EVENT when TUR says otherwise
  [SCSI] bnx2i: Fixed kernel panic due to illegal usage of sc->request->cpu
  [SCSI] bfa: Update the driver version to 3.0.2.1
  [SCSI] bfa: Driver and BSG enhancements.
  [SCSI] bfa: Added support to query PHY.
  [SCSI] bfa: Added HBA diagnostics support.
  [SCSI] bfa: Added support for flash configuration
  [SCSI] bfa: Added support to obtain SFP info.
  [SCSI] bfa: Added support for CEE info and stats query.
  [SCSI] bfa: Extend BSG interface.
  [SCSI] bfa: FCS bug fixes.
  [SCSI] bfa: DMA memory allocation enhancement.
  [SCSI] bfa: Brocade-1860 Fabric Adapter vHBA support.
  [SCSI] bfa: Brocade-1860 Fabric Adapter PLL init fixes.
  [SCSI] bfa: Added Fabric Assigned Address(FAA) support
  [SCSI] bfa: IOC bug fixes.
  [SCSI] bfa: Enable ASIC block configuration and query.
  [SCSI] bnx2i: Updated copyright and bump version
  [SCSI] bnx2i: Modified to skip CNIC registration if iSCSI is not supported
  ...

Fix up some trivial conflicts in:
 - drivers/scsi/bnx2fc/{bnx2fc.h,bnx2fc_fcoe.c}:
	Crazy broadcom version number conflicts
 - drivers/target/tcm_fc/tfc_cmd.c
	Just trivial cleanups done on adjacent lines

3 files changed, 40 insertions, 2 deletions

diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
index 3b8a6451ea28..f5a0665b6773 100644
--- a/drivers/scsi/libfc/fc_exch.c
+++ b/drivers/scsi/libfc/fc_exch.c
@@ -965,8 +965,30 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
                 sp = &ep->seq;
                 if (sp->id != fh->fh_seq_id) {
                         atomic_inc(&mp->stats.seq_not_found);
-                        reject = FC_RJT_SEQ_ID; /* sequence/exch should exist */
-                        goto rel;
+                        if (f_ctl & FC_FC_END_SEQ) {
+                                /*
+                                 * Update sequence_id based on incoming last
+                                 * frame of sequence exchange. This is needed
+                                 * for FCoE target where DDP has been used
+                                 * on target where, stack is indicated only
+                                 * about last frame's (payload _header) header.
+                                 * Whereas "seq_id" which is part of
+                                 * frame_header is allocated by initiator
+                                 * which is totally different from "seq_id"
+                                 * allocated when XFER_RDY was sent by target.
+                                 * To avoid false -ve which results into not
+                                 * sending RSP, hence write request on other
+                                 * end never finishes.
+                                 */
+                                spin_lock_bh(&ep->ex_lock);
+                                sp->ssb_stat |= SSB_ST_RESP;
+                                sp->id = fh->fh_seq_id;
+                                spin_unlock_bh(&ep->ex_lock);
+                        } else {
+                                /* sequence/exch should exist */
+                                reject = FC_RJT_SEQ_ID;
+                                goto rel;
+                        }
                 }
         }
         WARN_ON(ep != fc_seq_exch(sp));
diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c
index 389ab80aef0a..e008b1673507 100644
--- a/drivers/scsi/libfc/fc_lport.c
+++ b/drivers/scsi/libfc/fc_lport.c
@@ -1025,6 +1025,8 @@ static void fc_lport_enter_reset(struct fc_lport *lport)
                         fc_vport_set_state(lport->vport, FC_VPORT_LINKDOWN);
         }
         fc_lport_state_enter(lport, LPORT_ST_RESET);
+        fc_host_post_event(lport->host, fc_get_event_number(),
+                           FCH_EVT_LIPRESET, 0);
         fc_vports_linkchange(lport);
         fc_lport_reset_locked(lport);
         if (lport->link_up)
diff --git a/drivers/scsi/libfc/fc_rport.c b/drivers/scsi/libfc/fc_rport.c
index 01e13a2eb93a..760db7619446 100644
--- a/drivers/scsi/libfc/fc_rport.c
+++ b/drivers/scsi/libfc/fc_rport.c
@@ -789,6 +789,20 @@ static void fc_rport_recv_flogi_req(struct fc_lport *lport,
 
         switch (rdata->rp_state) {
         case RPORT_ST_INIT:
+                /*
+                 * If received the FLOGI request on RPORT which is INIT state
+                 * (means not transition to FLOGI either fc_rport timeout
+                 * function didn;t trigger or this end hasn;t received
+                 * beacon yet from other end. In that case only, allow RPORT
+                 * state machine to continue, otherwise fall through which
+                 * causes the code to send reject response.
+                 * NOTE; Not checking for FIP->state such as VNMP_UP or
+                 * VNMP_CLAIM because if FIP state is not one of those,
+                 * RPORT wouldn;t have created and 'rport_lookup' would have
+                 * failed anyway in that case.
+                 */
+                if (lport->point_to_multipoint)
+                        break;
         case RPORT_ST_DELETE:
                 mutex_unlock(&rdata->rp_mutex);
                 rjt_data.reason = ELS_RJT_FIP;