* [2.6 patch] remove bogus CONFIG_GFAR_NAPI's
@ 2008-08-04 8:59 Adrian Bunk
2008-08-07 6:11 ` Jeff Garzik
0 siblings, 1 reply; 2+ messages in thread
From: Adrian Bunk @ 2008-08-04 8:59 UTC (permalink / raw)
To: Francois Romieu, Scott Wood, Kumar Gala, Jeff Garzik
Cc: netdev, Robert P. J. Day
The commit that made the CONFIG_GFAR_NAPI code unconditional was
included at the same time as a new CONFIG_GFAR_NAPI user, resulting
in these bugus #ifdef's.
Reported-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
---
drivers/net/gianfar.c | 4 ----
1 file changed, 4 deletions(-)
f30b77c42e33dee1d469a1f1fd0fcfd9cdc26761
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index b8394cf..ca6cf6e 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -414,9 +414,7 @@ static int gfar_suspend(struct platform_device *pdev, pm_message_t state)
spin_unlock(&priv->rxlock);
spin_unlock_irqrestore(&priv->txlock, flags);
-#ifdef CONFIG_GFAR_NAPI
napi_disable(&priv->napi);
-#endif
if (magic_packet) {
/* Enable interrupt on Magic Packet */
@@ -469,9 +467,7 @@ static int gfar_resume(struct platform_device *pdev)
netif_device_attach(dev);
-#ifdef CONFIG_GFAR_NAPI
napi_enable(&priv->napi);
-#endif
return 0;
}
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [2.6 patch] remove bogus CONFIG_GFAR_NAPI's
2008-08-04 8:59 [2.6 patch] remove bogus CONFIG_GFAR_NAPI's Adrian Bunk
@ 2008-08-07 6:11 ` Jeff Garzik
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2008-08-07 6:11 UTC (permalink / raw)
To: Adrian Bunk
Cc: Francois Romieu, Scott Wood, Kumar Gala, netdev, Robert P. J. Day
Adrian Bunk wrote:
> The commit that made the CONFIG_GFAR_NAPI code unconditional was
> included at the same time as a new CONFIG_GFAR_NAPI user, resulting
> in these bugus #ifdef's.
>
> Reported-by: Robert P. J. Day <rpjday@crashcourse.ca>
> Signed-off-by: Adrian Bunk <bunk@kernel.org>
>
> ---
>
> drivers/net/gianfar.c | 4 ----
> 1 file changed, 4 deletions(-)
>
> f30b77c42e33dee1d469a1f1fd0fcfd9cdc26761
> diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
> index b8394cf..ca6cf6e 100644
> --- a/drivers/net/gianfar.c
> +++ b/drivers/net/gianfar.c
> @@ -414,9 +414,7 @@ static int gfar_suspend(struct platform_device *pdev, pm_message_t state)
> spin_unlock(&priv->rxlock);
> spin_unlock_irqrestore(&priv->txlock, flags);
>
> -#ifdef CONFIG_GFAR_NAPI
> napi_disable(&priv->napi);
> -#endif
>
> if (magic_packet) {
> /* Enable interrupt on Magic Packet */
> @@ -469,9 +467,7 @@ static int gfar_resume(struct platform_device *pdev)
>
> netif_device_attach(dev);
>
> -#ifdef CONFIG_GFAR_NAPI
> napi_enable(&priv->napi);
> -#endif
>
> return 0;
applied
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-08-07 6:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-04 8:59 [2.6 patch] remove bogus CONFIG_GFAR_NAPI's Adrian Bunk
2008-08-07 6:11 ` Jeff Garzik
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).