From patchwork Mon Oct 25 16:17:30 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eli Cohen X-Patchwork-Id: 267342 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9PGH6c0021360 for ; Mon, 25 Oct 2010 16:17:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751542Ab0JYQRF (ORCPT ); Mon, 25 Oct 2010 12:17:05 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:43882 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751267Ab0JYQRE (ORCPT ); Mon, 25 Oct 2010 12:17:04 -0400 Received: by bwz11 with SMTP id 11so2513653bwz.19 for ; Mon, 25 Oct 2010 09:17:02 -0700 (PDT) Received: by 10.204.99.68 with SMTP id t4mr5027018bkn.40.1288023422277; Mon, 25 Oct 2010 09:17:02 -0700 (PDT) Received: from localhost ([82.166.227.17]) by mx.google.com with ESMTPS id y19sm4981670bkw.6.2010.10.25.09.17.00 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 25 Oct 2010 09:17:01 -0700 (PDT) Date: Mon, 25 Oct 2010 18:17:30 +0200 From: Eli Cohen To: Roland Dreier Cc: Or Gerlitz , RDMA list Subject: Re: can't get IB link with the for-next branch / IBoE patches Message-ID: <20101025161730.GA9335@mtldesk30> References: <20101024075835.GA11359@mtldesk30> <20101024160018.GA32499@mtldesk30> <4CC54D4E.7050203@Voltaire.com> <4CC5604D.2080803@Voltaire.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 25 Oct 2010 16:17:07 +0000 (UTC) diff --git a/drivers/infiniband/core/ud_header.c b/drivers/infiniband/core/ud_header.c index 7e5d224..bb7e192 100644 --- a/drivers/infiniband/core/ud_header.c +++ b/drivers/infiniband/core/ud_header.c @@ -241,7 +241,7 @@ void ib_ud_header_init(int payload_bytes, packet_length = (IB_LRH_BYTES + IB_BTH_BYTES + IB_DETH_BYTES + - grh_present ? IB_GRH_BYTES : 0 + + (grh_present ? IB_GRH_BYTES : 0) + payload_bytes + 4 + /* ICRC */ 3) / 4; /* round up */