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: (276 commits)
  [SCSI] zfcp: Trigger logging in the FCP channel on qdio error conditions
  [SCSI] zfcp: Introduce experimental support for DIF/DIX
  [SCSI] zfcp: Enable data division support for FCP devices
  [SCSI] zfcp: Prevent access on uninitialized memory.
  [SCSI] zfcp: Post events through FC transport class
  [SCSI] zfcp: Cleanup QDIO attachment and improve processing.
  [SCSI] zfcp: Cleanup function parameters for sbal value.
  [SCSI] zfcp: Use correct width for timer_interval field
  [SCSI] zfcp: Remove SCSI device when removing unit
  [SCSI] zfcp: Use memdup_user and kstrdup
  [SCSI] zfcp: Fix retry after failed "open port" erp action
  [SCSI] zfcp: Fail erp after timeout
  [SCSI] zfcp: Use forced_reopen in terminate_rport_io callback
  [SCSI] zfcp: Register SCSI devices after successful fc_remote_port_add
  [SCSI] zfcp: Do not try "forced close" when port is already closed
  [SCSI] zfcp: Do not unblock rport from REOPEN_PORT_FORCED
  [SCSI] sd: add support for runtime PM
  [SCSI] implement runtime Power Management
  [SCSI] convert to the new PM framework
  [SCSI] Unify SAM_ and SAM_STAT_ macros
  ...

2 files changed, 7 insertions, 0 deletions

diff --git a/drivers/scsi/cxgb3i/cxgb3i_ddp.c b/drivers/scsi/cxgb3i/cxgb3i_ddp.c
index b58d9134ac1b..be0e23042c76 100644
--- a/drivers/scsi/cxgb3i/cxgb3i_ddp.c
+++ b/drivers/scsi/cxgb3i/cxgb3i_ddp.c
@@ -499,6 +499,7 @@ static int setup_conn_pgidx(struct t3cdev *tdev, unsigned int tid, int pg_idx,
         /* set up ulp submode and page size */
         req = (struct cpl_set_tcb_field *)skb_put(skb, sizeof(*req));
         req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD));
+        req->wr.wr_lo = 0;
         OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_SET_TCB_FIELD, tid));
         req->reply = V_NO_REPLY(reply ? 0 : 1);
         req->cpu_idx = 0;
@@ -564,6 +565,7 @@ int cxgb3i_setup_conn_digest(struct t3cdev *tdev, unsigned int tid,
         /* set up ulp submode and page size */
         req = (struct cpl_set_tcb_field *)skb_put(skb, sizeof(*req));
         req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD));
+        req->wr.wr_lo = 0;
         OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_SET_TCB_FIELD, tid));
         req->reply = V_NO_REPLY(reply ? 0 : 1);
         req->cpu_idx = 0;
diff --git a/drivers/scsi/cxgb3i/cxgb3i_offload.c b/drivers/scsi/cxgb3i/cxgb3i_offload.c
index 3b6a06eebf7f..3ee13cf9556b 100644
--- a/drivers/scsi/cxgb3i/cxgb3i_offload.c
+++ b/drivers/scsi/cxgb3i/cxgb3i_offload.c
@@ -264,6 +264,7 @@ static void make_act_open_req(struct s3_conn *c3cn, struct sk_buff *skb,
         skb->priority = CPL_PRIORITY_SETUP;
         req = (struct cpl_act_open_req *)__skb_put(skb, sizeof(*req));
         req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD));
+        req->wr.wr_lo = 0;
         OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_ACT_OPEN_REQ, atid));
         req->local_port = c3cn->saddr.sin_port;
         req->peer_port = c3cn->daddr.sin_port;
@@ -273,6 +274,7 @@ static void make_act_open_req(struct s3_conn *c3cn, struct sk_buff *skb,
                            V_TX_CHANNEL(e->smt_idx));
         req->opt0l = htonl(calc_opt0l(c3cn));
         req->params = 0;
+        req->opt2 = 0;
 }
 
 static void fail_act_open(struct s3_conn *c3cn, int errno)
@@ -379,6 +381,7 @@ static void send_abort_req(struct s3_conn *c3cn)
 
         c3cn->cpl_abort_req = NULL;
         req = (struct cpl_abort_req *)skb->head;
+        memset(req, 0, sizeof(*req));
 
         skb->priority = CPL_PRIORITY_DATA;
         set_arp_failure_handler(skb, abort_arp_failure);
@@ -406,6 +409,7 @@ static void send_abort_rpl(struct s3_conn *c3cn, int rst_status)
         c3cn->cpl_abort_rpl = NULL;
 
         skb->priority = CPL_PRIORITY_DATA;
+        memset(rpl, 0, sizeof(*rpl));
         rpl->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_OFLD_HOST_ABORT_CON_RPL));
         rpl->wr.wr_lo = htonl(V_WR_TID(c3cn->tid));
         OPCODE_TID(rpl) = htonl(MK_OPCODE_TID(CPL_ABORT_RPL, c3cn->tid));
@@ -430,6 +434,7 @@ static u32 send_rx_credits(struct s3_conn *c3cn, u32 credits, u32 dack)
 
         req = (struct cpl_rx_data_ack *)__skb_put(skb, sizeof(*req));
         req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD));
+        req->wr.wr_lo = 0;
         OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_RX_DATA_ACK, c3cn->tid));
         req->credit_dack = htonl(dack | V_RX_CREDITS(credits));
         skb->priority = CPL_PRIORITY_ACK;