From patchwork Wed Feb 18 12:38:27 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: roel kluin X-Patchwork-Id: 23341 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 83EF5DDE1A for ; Wed, 18 Feb 2009 23:38:38 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751953AbZBRMib (ORCPT ); Wed, 18 Feb 2009 07:38:31 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751851AbZBRMia (ORCPT ); Wed, 18 Feb 2009 07:38:30 -0500 Received: from fk-out-0910.google.com ([209.85.128.185]:27667 "EHLO fk-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751773AbZBRMia (ORCPT ); Wed, 18 Feb 2009 07:38:30 -0500 Received: by fk-out-0910.google.com with SMTP id f33so1727988fkf.5 for ; Wed, 18 Feb 2009 04:38:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:cc:subject:references:in-reply-to :content-type:content-transfer-encoding; bh=G2cj3R8nitiBNFz3TdGqWkjunyfDZCR33LXRkwGQbcc=; b=Bl2Hv+tttv46axWZ2ZGOQdM9SGO+g5CVGWlFTfqrz+XskwCO1VFvVttVXWFnAHGwK1 awacGCVw6VKNa4jVPN2XrlkqQ/OndAp3EUDWV7irsNvjOu2sb+L5JyiPesUqqvwR0Ve/ rBYxJCgT3cKw9Cr6z5lMSrdcgl8x8Sd4uvf1Q= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; b=AEunKMvN5wdrhWnN8CiRC1kwJsBV27wxQqkiaO2FhqnBqaOL7vX/0Q5ng+4qXKHKhz ISN9DgLKzPzQWSp/dj/V7ahCvu3XAIVwySPOC2oRZDfg7DBs5XxLI/6XgBqbbev+AvkY 8UQqQ9ocXqkFEzaqVB0c6Z0NdSO8huHjOyI8Q= Received: by 10.223.119.5 with SMTP id x5mr4615447faq.40.1234960707490; Wed, 18 Feb 2009 04:38:27 -0800 (PST) Received: from ?192.168.1.115? (d133062.upc-d.chello.nl [213.46.133.62]) by mx.google.com with ESMTPS id 35sm4906416nfu.7.2009.02.18.04.38.26 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 18 Feb 2009 04:38:26 -0800 (PST) Message-ID: <499C0143.1080703@gmail.com> Date: Wed, 18 Feb 2009 13:38:27 +0100 From: Roel Kluin User-Agent: Thunderbird 2.0.0.18 (X11/20081105) MIME-Version: 1.0 To: swise@opengridcomputing.com CC: Andrew Morton , "David S. Miller" , netdev@vger.kernel.org Subject: Re: [PATCH] RDMA/cxgb3: logical-/bit-or confusion? References: <499BD470.4080705@gmail.com> In-Reply-To: <499BD470.4080705@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Dropped general@lists.openfabrics.org since it bounces, and I missed one in my previously sent patch --------------------------->8-------------8<------------------------------ Logical-/bit-or typo Signed-off-by: Roel Kluin Reviewed-by: Steve Wise --- -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/infiniband/hw/cxgb3/iwch_cm.c b/drivers/infiniband/hw/cxgb3/iwch_cm.c index 44e936e..21c6145 100644 --- a/drivers/infiniband/hw/cxgb3/iwch_cm.c +++ b/drivers/infiniband/hw/cxgb3/iwch_cm.c @@ -890,7 +890,7 @@ static void process_mpa_reply(struct iwch_ep *ep, struct sk_buff *skb) */ state_set(&ep->com, FPDU_MODE); ep->mpa_attr.initiator = 1; - ep->mpa_attr.crc_enabled = (mpa->flags & MPA_CRC) | crc_enabled ? 1 : 0; + ep->mpa_attr.crc_enabled = (mpa->flags & MPA_CRC) || crc_enabled ? 1 : 0; ep->mpa_attr.recv_marker_enabled = markers_enabled; ep->mpa_attr.xmit_marker_enabled = mpa->flags & MPA_MARKERS ? 1 : 0; ep->mpa_attr.version = mpa_rev; @@ -1013,7 +1013,7 @@ static void process_mpa_request(struct iwch_ep *ep, struct sk_buff *skb) * start reply message including private data. */ ep->mpa_attr.initiator = 0; - ep->mpa_attr.crc_enabled = (mpa->flags & MPA_CRC) | crc_enabled ? 1 : 0; + ep->mpa_attr.crc_enabled = (mpa->flags & MPA_CRC) || crc_enabled ? 1 : 0; ep->mpa_attr.recv_marker_enabled = markers_enabled; ep->mpa_attr.xmit_marker_enabled = mpa->flags & MPA_MARKERS ? 1 : 0; ep->mpa_attr.version = mpa_rev;