From 318cd5dd2dbb67b35b952f8a0b7b018e173b7647 Mon Sep 17 00:00:00 2001 From: Karen Xie Date: Thu, 28 Jun 2012 16:49:07 -0700 Subject: [PATCH] --- yaml --- r: 316796 b: refs/heads/master c: 6aca4112f67b67d0a2f60326a1331a4125564ca7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 937c4661444b..019773118c65 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b485462aca7df4e32bcf7efb6f84a69e8b640243 +refs/heads/master: 6aca4112f67b67d0a2f60326a1331a4125564ca7 diff --git a/trunk/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c b/trunk/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c index 5a4a3bfc60cf..a12a1fe9cda4 100644 --- a/trunk/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c +++ b/trunk/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c @@ -438,8 +438,8 @@ static inline void make_tx_data_wr(struct cxgbi_sock *csk, struct sk_buff *skb, if (submode) wr_ulp_mode = FW_OFLD_TX_DATA_WR_ULPMODE(ULP2_MODE_ISCSI) | FW_OFLD_TX_DATA_WR_ULPSUBMODE(submode); - req->tunnel_to_proxy = htonl(wr_ulp_mode) | - FW_OFLD_TX_DATA_WR_SHOVE(skb_peek(&csk->write_queue) ? 0 : 1); + req->tunnel_to_proxy = htonl(wr_ulp_mode | + FW_OFLD_TX_DATA_WR_SHOVE(skb_peek(&csk->write_queue) ? 0 : 1)); req->plen = htonl(len); if (!cxgbi_sock_flag(csk, CTPF_TX_DATA_SENT)) cxgbi_sock_set_flag(csk, CTPF_TX_DATA_SENT);