drivers/net: correct valid flag
in [Kernel]
|
Prev: [PATCH 2/2] sched: make sched_param arugment static variables in some sched_setscheduler() caller
Next: [PATCH 3/5] perf probe: Support "string" type
From: David Miller on 5 Jul 2010 21:10 From: Julia Lawall <julia(a)diku.dk> Date: Mon, 5 Jul 2010 17:07:15 +0200 (CEST) > From: Julia Lawall <julia(a)diku.dk> > > 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(a)diku.dk> > > --- > 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 linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Julia Lawall on 6 Jul 2010 01:10 On Mon, 5 Jul 2010, David Miller wrote: > From: Julia Lawall <julia(a)diku.dk> > Date: Mon, 5 Jul 2010 17:07:15 +0200 (CEST) > > > From: Julia Lawall <julia(a)diku.dk> > > > > 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(a)diku.dk> > > > > --- > > 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. OK, I'll put it back. julia -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: David Miller on 6 Jul 2010 01:20 From: Julia Lawall <julia(a)diku.dk> Date: Tue, 6 Jul 2010 07:11:45 +0200 (CEST) > From: Julia Lawall <julia(a)diku.dk> > > 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(a)diku.dk> Since the two values are identical this doesn't fix a bug, so I've applied this to net-next-2.6 Thanks! -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Julia Lawall on 6 Jul 2010 01:20
From: Julia Lawall <julia(a)diku.dk> 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(a)diku.dk> --- diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index 268ea4d..9ef6a9d 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c @@ -2468,7 +2468,7 @@ 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)) { dprintk(KERN_DEBUG "%s: nv_tx_done_optimized: flags 0x%x.\n", -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |