--- drivers/infiniband/hw/cxgb3/iwch_cm.c

+++ drivers/infiniband/hw/cxgb3/iwch_cm.c

@@ -486,7 +486,8 @@ static int send_connect(struct iwch_ep *

V_MSS_IDX(mtu_idx) |

V_L2T_IDX(ep->l2t->idx) | V_TX_CHANNEL(ep->l2t->smt_idx);

opt0l = V_TOS((ep->tos >> 2) & M_TOS) | V_RCV_BUFSIZ(rcv_win>>10);

- opt2 = V_FLAVORS_VALID(1) | V_CONG_CONTROL_FLAVOR(cong_flavor);

+ opt2 = F_RX_COALESCE_VALID | V_RX_COALESCE(0) | V_FLAVORS_VALID(1) |

+ V_CONG_CONTROL_FLAVOR(cong_flavor);

skb->priority = CPL_PRIORITY_SETUP;

set_arp_failure_handler(skb, act_open_req_arp_failure);

@@ -1303,7 +1304,8 @@ static void accept_cr(struct iwch_ep *ep

V_MSS_IDX(mtu_idx) |

V_L2T_IDX(ep->l2t->idx) | V_TX_CHANNEL(ep->l2t->smt_idx);

opt0l = V_TOS((ep->tos >> 2) & M_TOS) | V_RCV_BUFSIZ(rcv_win>>10);

- opt2 = V_FLAVORS_VALID(1) | V_CONG_CONTROL_FLAVOR(cong_flavor);

+ opt2 = F_RX_COALESCE_VALID | V_RX_COALESCE(0) | V_FLAVORS_VALID(1) |

+ V_CONG_CONTROL_FLAVOR(cong_flavor);

rpl = cplhdr(skb);

rpl->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD));