tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
RDMA/cxgb3: Turn off RX coalescing for iWARP connections

Linus Torvalds d6f74be0 6e029fe3

+4 -2
unified split
+4 -2
drivers/infiniband/hw/cxgb3/iwch_cm.c
··· 463 463 V_MSS_IDX(mtu_idx) | 464 464 V_L2T_IDX(ep->l2t->idx) | V_TX_CHANNEL(ep->l2t->smt_idx); 465 465 opt0l = V_TOS((ep->tos >> 2) & M_TOS) | V_RCV_BUFSIZ(rcv_win>>10); 466 - opt2 = V_FLAVORS_VALID(1) | V_CONG_CONTROL_FLAVOR(cong_flavor); 466 + opt2 = F_RX_COALESCE_VALID | V_RX_COALESCE(0) | V_FLAVORS_VALID(1) | 467 + V_CONG_CONTROL_FLAVOR(cong_flavor); 467 468 skb->priority = CPL_PRIORITY_SETUP; 468 469 set_arp_failure_handler(skb, act_open_req_arp_failure); 469 470 ··· 1281 1280 V_MSS_IDX(mtu_idx) | 1282 1281 V_L2T_IDX(ep->l2t->idx) | V_TX_CHANNEL(ep->l2t->smt_idx); 1283 1282 opt0l = V_TOS((ep->tos >> 2) & M_TOS) | V_RCV_BUFSIZ(rcv_win>>10); 1284 - opt2 = V_FLAVORS_VALID(1) | V_CONG_CONTROL_FLAVOR(cong_flavor); 1283 + opt2 = F_RX_COALESCE_VALID | V_RX_COALESCE(0) | V_FLAVORS_VALID(1) | 1284 + V_CONG_CONTROL_FLAVOR(cong_flavor); 1285 1285 1286 1286 rpl = cplhdr(skb); 1287 1287 rpl->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD));