From: Karen Xie Date: Thu, 28 Jun 2012 23:49:07 +0000 (-0700) Subject: [SCSI] cxgb4i: tcp push bit fix X-Git-Tag: upstream/snapshot3+hdmi~6975^2~51 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6aca4112f67b67d0a2f60326a1331a4125564ca7;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git [SCSI] cxgb4i: tcp push bit fix Fixed the parentheses so the tcp push bit would be sent properly. Signed-off-by: Karen Xie Reviewed-by: Mike Christie Signed-off-by: James Bottomley --- diff --git a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c index 5a4a3bf..a12a1fe 100644 --- a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c +++ b/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);