From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755576Ab0GFBDi (ORCPT ); Mon, 5 Jul 2010 21:03:38 -0400 Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:40641 "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753056Ab0GFBDg (ORCPT ); Mon, 5 Jul 2010 21:03:36 -0400 Date: Mon, 05 Jul 2010 18:03:49 -0700 (PDT) Message-Id: <20100705.180349.112607097.davem@davemloft.net> To: julia@diku.dk Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: Re: [PATCH] drivers/net: correct valid flag From: David Miller In-Reply-To: References: X-Mailer: Mew version 6.3 on Emacs 23.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Julia Lawall Date: Mon, 5 Jul 2010 17:07:15 +0200 (CEST) > From: Julia Lawall > > Elsewhere in the "optimized" functions, the "2" constants are used. > NV_TX_VALID and NV_TX2_VALID have the same value. > > Signed-off-by: Julia Lawall > > --- > diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c > index 268ea4d..870c18b 100644 > --- a/drivers/net/forcedeth.c > +++ b/drivers/net/forcedeth.c > @@ -2468,7 +2468,8 @@ static int nv_tx_done_optimized(struct net_device *dev, int limit) > struct ring_desc_ex* orig_get_tx = np->get_tx.ex; > > while ((np->get_tx.ex != np->put_tx.ex) && > - !((flags = le32_to_cpu(np->get_tx.ex->flaglen)) & NV_TX_VALID) && > + !((flags = le32_to_cpu(np->get_tx.ex->flaglen)) & NV_TX2_VALID) > + && > (tx_work < limit)) { Please don't put that "&&" on a line by itself. I don't care if leaving it on the previous line makes it exceed 80 columns, what you're doing here is infinitely less pleasant to read.