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

1 files changed, 19 insertions, 7 deletions

diff --git a/drivers/target/tcm_fc/tfc_cmd.c b/drivers/target/tcm_fc/tfc_cmd.c
index a9e9a31da11d..a6bfb6deba94 100644
--- a/drivers/target/tcm_fc/tfc_cmd.c
+++ b/drivers/target/tcm_fc/tfc_cmd.c
@@ -264,8 +264,9 @@ int ft_write_pending(struct se_cmd *se_cmd)
                                 cmd->sg_cnt =
                                         se_cmd->t_tasks_sg_chained_no;
                         }
-                        if (cmd->sg && lport->tt.ddp_setup(lport, ep->xid,
-                                                    cmd->sg, cmd->sg_cnt))
+                        if (cmd->sg && lport->tt.ddp_target(lport, ep->xid,
+                                                            cmd->sg,
+                                                            cmd->sg_cnt))
                                 cmd->was_ddp_setup = 1;
                 }
         }
@@ -371,12 +372,23 @@ static void ft_send_resp_status(struct fc_lport *lport,
 
 /*
  * Send error or task management response.
- * Always frees the cmd and associated state.
  */
-static void ft_send_resp_code(struct ft_cmd *cmd, enum fcp_resp_rsp_codes code)
+static void ft_send_resp_code(struct ft_cmd *cmd,
+                              enum fcp_resp_rsp_codes code)
 {
         ft_send_resp_status(cmd->sess->tport->lport,
                             cmd->req_frame, SAM_STAT_GOOD, code);
+}
+
+
+/*
+ * Send error or task management response.
+ * Always frees the cmd and associated state.
+ */
+static void ft_send_resp_code_and_free(struct ft_cmd *cmd,
+                                      enum fcp_resp_rsp_codes code)
+{
+        ft_send_resp_code(cmd, code);
         ft_free_cmd(cmd);
 }
 
@@ -414,7 +426,7 @@ static void ft_send_tm(struct ft_cmd *cmd)
                  * tm_flags set is invalid.
                  */
                 pr_debug("invalid FCP tm_flags %x\n", fcp->fc_tm_flags);
-                ft_send_resp_code(cmd, FCP_CMND_FIELDS_INVALID);
+                ft_send_resp_code_and_free(cmd, FCP_CMND_FIELDS_INVALID);
                 return;
         }
 
@@ -422,7 +434,7 @@ static void ft_send_tm(struct ft_cmd *cmd)
         tmr = core_tmr_alloc_req(&cmd->se_cmd, cmd, tm_func);
         if (!tmr) {
                 pr_debug("alloc failed\n");
-                ft_send_resp_code(cmd, FCP_TMF_FAILED);
+                ft_send_resp_code_and_free(cmd, FCP_TMF_FAILED);
                 return;
         }
         cmd->se_cmd.se_tmr_req = tmr;
@@ -661,7 +673,7 @@ static void ft_send_cmd(struct ft_cmd *cmd)
         return;
 
 err:
-        ft_send_resp_code(cmd, FCP_CMND_FIELDS_INVALID);
+        ft_send_resp_code_and_free(cmd, FCP_CMND_FIELDS_INVALID);
 }
 
 /*