From patchwork Fri Aug 6 07:07:50 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 61071 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.180.67]) by ozlabs.org (Postfix) with ESMTP id E80CAB6EFE for ; Fri, 6 Aug 2010 17:09:42 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933898Ab0HFHJf (ORCPT ); Fri, 6 Aug 2010 03:09:35 -0400 Received: from mail-wy0-f174.google.com ([74.125.82.174]:57036 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933221Ab0HFHJd (ORCPT ); Fri, 6 Aug 2010 03:09:33 -0400 Received: by wyb39 with SMTP id 39so7454454wyb.19 for ; Fri, 06 Aug 2010 00:09:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mail-followup-to:references:mime-version:content-type :content-disposition:in-reply-to:user-agent; bh=lmAmr70PBk22TgKhTrhomyVxGNKmELhzjXbyPpnYM0U=; b=JmpWuqume7Z1zpdBmW0hdaeWZk8cdvgTnqwmgWvkQvjNw/yAke3e0+UHVzMwQqkVr4 LEve2t1QzknKhnwbNMbioaVAKRnRF5IUNq3Xm2CjNAtvZ/J9LmxZ0AVAnXKq7IZsG4xe yJ88rqVs6+4orIIh1xXoMie9VYRuZXWW/wVLM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mail-followup-to:references :mime-version:content-type:content-disposition:in-reply-to :user-agent; b=HnvaoNExcmGt/aFxTtAAA1VdQfj+3fInWHlXBCjyQBo1kizcEOlyMsVEcPuGxcZmEG Ky2J+VL1wF224k+FkZB3+porySRxGe/9qQSwlx0ZrIH9UXoR65MmjkHsbRaBJaKzm/Tq DiVx1CnVnZoRyvFt4mk86D/zmnKk27EP5cJR8= Received: by 10.216.3.83 with SMTP id 61mr488312weg.110.1281078571877; Fri, 06 Aug 2010 00:09:31 -0700 (PDT) Received: from bicker ([205.177.176.130]) by mx.google.com with ESMTPS id v16sm642734weq.32.2010.08.06.00.08.55 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 06 Aug 2010 00:09:30 -0700 (PDT) Date: Fri, 6 Aug 2010 09:07:50 +0200 From: Dan Carpenter To: Julia Lawall Cc: Eilon Greenstein , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: Re: [PATCH 32/42] drivers/net/bnx2x: Adjust confusing if indentation Message-ID: <20100806070749.GP9031@bicker> Mail-Followup-To: Dan Carpenter , Julia Lawall , Eilon Greenstein , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Thu, Aug 05, 2010 at 10:26:38PM +0200, Julia Lawall wrote: > --- > This patch doesn't change the semantics of the code. But it might not be > what is intended. > I think there may have been some if statements which were removed before the code was merged into the kernel? Here is another one from that same function. Someone can roll this in with your patch. regards, dan carpenter --- 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/net/bnx2x/bnx2x_link.c b/drivers/net/bnx2x/bnx2x_link.c index 0fa0991..ca0e435 100644 --- a/drivers/net/bnx2x/bnx2x_link.c +++ b/drivers/net/bnx2x/bnx2x_link.c @@ -1242,11 +1242,11 @@ static void bnx2x_set_autoneg(struct link_params *params, MDIO_CL73_USERB0_CL73_BAM_CTRL1_BAM_NP_AFTER_BP_EN); /* Advertise CL73 link speeds */ - CL45_RD_OVER_CL22(bp, params->port, - params->phy_addr, - MDIO_REG_BANK_CL73_IEEEB1, - MDIO_CL73_IEEEB1_AN_ADV2, - ®_val); + CL45_RD_OVER_CL22(bp, params->port, + params->phy_addr, + MDIO_REG_BANK_CL73_IEEEB1, + MDIO_CL73_IEEEB1_AN_ADV2, + ®_val); if (params->speed_cap_mask & PORT_HW_CFG_SPEED_CAPABILITY_D0_10G) reg_val |= MDIO_CL73_IEEEB1_AN_ADV2_ADVR_10G_KX4;