From: Julia Lawall <julia@xxxxxxx> Date: Mon, 5 Jul 2010 17:07:15 +0200 (CEST) > From: Julia Lawall <julia@xxxxxxx> > > 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 <julia@xxxxxxx> > > --- > 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. -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html