* [PATCH][NET] gianfar: fix obviously wrong #ifdef CONFIG_GFAR_NAPI placement
@ 2007-10-17 19:57 Anton Vorontsov
2007-10-18 0:21 ` Jeff Garzik
2007-10-18 9:40 ` Andy Whitcroft
0 siblings, 2 replies; 3+ messages in thread
From: Anton Vorontsov @ 2007-10-17 19:57 UTC (permalink / raw)
To: leoli, jgarzik, paulus; +Cc: netdev, linux-kernel, linuxppc-dev
Erroneous #ifdef introduced by 293c8513398657f6263fcdb03c87f2760cf61be4
causing NAPI-less ethernet malfunctioning.
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
---
if (...)
#if
...;
#endif
good candidate for checkpatch?
drivers/net/gianfar.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index cc288d8..38268d7 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -956,10 +956,12 @@ static int gfar_enet_open(struct net_device *dev)
}
err = startup_gfar(dev);
- if (err)
+ if (err) {
#ifdef CONFIG_GFAR_NAPI
napi_disable(&priv->napi);
#endif
+ return err;
+ }
netif_start_queue(dev);
--
1.5.0.6
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH][NET] gianfar: fix obviously wrong #ifdef CONFIG_GFAR_NAPI placement
2007-10-17 19:57 [PATCH][NET] gianfar: fix obviously wrong #ifdef CONFIG_GFAR_NAPI placement Anton Vorontsov
@ 2007-10-18 0:21 ` Jeff Garzik
2007-10-18 9:40 ` Andy Whitcroft
1 sibling, 0 replies; 3+ messages in thread
From: Jeff Garzik @ 2007-10-18 0:21 UTC (permalink / raw)
To: Anton Vorontsov; +Cc: netdev, linux-kernel, linuxppc-dev, paulus, leoli
Anton Vorontsov wrote:
> Erroneous #ifdef introduced by 293c8513398657f6263fcdb03c87f2760cf61be4
> causing NAPI-less ethernet malfunctioning.
>
> Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
> Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
applied
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH][NET] gianfar: fix obviously wrong #ifdef CONFIG_GFAR_NAPI placement
2007-10-17 19:57 [PATCH][NET] gianfar: fix obviously wrong #ifdef CONFIG_GFAR_NAPI placement Anton Vorontsov
2007-10-18 0:21 ` Jeff Garzik
@ 2007-10-18 9:40 ` Andy Whitcroft
1 sibling, 0 replies; 3+ messages in thread
From: Andy Whitcroft @ 2007-10-18 9:40 UTC (permalink / raw)
To: Anton Vorontsov
Cc: netdev, linux-kernel, linuxppc-dev, paulus, leoli, jgarzik
The check then is to see if a non {}'d block has no statements in it if the
ifdef is null. Hmmm. May be possible. Will think on it.
if (err)
+#ifdef CONFIG_GFAR_NAPI
napi_disable(&priv->napi);
+#endif
-apw
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-10-18 9:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-10-17 19:57 [PATCH][NET] gianfar: fix obviously wrong #ifdef CONFIG_GFAR_NAPI placement Anton Vorontsov
2007-10-18 0:21 ` Jeff Garzik
2007-10-18 9:40 ` Andy Whitcroft
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).