* [PATCH] fs_enet: Don't call NAPI functions when NAPI is not used.
@ 2008-02-28 15:36 Laurent Pinchart
0 siblings, 0 replies; 3+ messages in thread
From: Laurent Pinchart @ 2008-02-28 15:36 UTC (permalink / raw)
To: linuxppc-dev list
[-- Attachment #1: Type: text/plain, Size: 923 bytes --]
fs_enet_close() calls napi_disable() unconditionally. This patch skips the
call when use_napi isn't set.
Signed-off-by: Laurent Pinchart <laurentp@cse-semaphore.com>
---
drivers/net/fs_enet/fs_enet-main.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/net/fs_enet/fs_enet-main.c
b/drivers/net/fs_enet/fs_enet-main.c
index c83bd65..1801ce3 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -835,7 +835,8 @@ static int fs_enet_close(struct net_device *dev)
netif_stop_queue(dev);
netif_carrier_off(dev);
- napi_disable(&fep->napi);
+ if (fep->fpi->use_napi)
+ napi_disable(&fep->napi);
phy_stop(fep->phydev);
spin_lock_irqsave(&fep->lock, flags);
--
1.5.0
--
Laurent Pinchart
CSE Semaphore Belgium
Chaussée de Bruxelles, 732A
B-1410 Waterloo
Belgium
T +32 (2) 387 42 59
F +32 (2) 387 42 75
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] fs_enet: Don't call NAPI functions when NAPI is not used.
@ 2008-04-11 12:05 Laurent Pinchart
2008-04-12 5:53 ` Jeff Garzik
0 siblings, 1 reply; 3+ messages in thread
From: Laurent Pinchart @ 2008-04-11 12:05 UTC (permalink / raw)
To: netdev; +Cc: linuxppc-dev, Jeff Garzik
fs_enet_close() calls napi_disable() unconditionally. This patch skips the
call when use_napi isn't set.
Signed-off-by: Laurent Pinchart <laurentp@cse-semaphore.com>
---
drivers/net/fs_enet/fs_enet-main.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index c83bd65..1801ce3 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -835,7 +835,8 @@ static int fs_enet_close(struct net_device *dev)
netif_stop_queue(dev);
netif_carrier_off(dev);
- napi_disable(&fep->napi);
+ if (fep->fpi->use_napi)
+ napi_disable(&fep->napi);
phy_stop(fep->phydev);
spin_lock_irqsave(&fep->lock, flags);
--
1.5.0
This is a bugfix and should probably go in 2.6.25.
--
Laurent Pinchart
CSE Semaphore Belgium
Chaussee de Bruxelles, 732A
B-1410 Waterloo
Belgium
T +32 (2) 387 42 59
F +32 (2) 387 42 75
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] fs_enet: Don't call NAPI functions when NAPI is not used.
2008-04-11 12:05 [PATCH] fs_enet: Don't call NAPI functions when NAPI is not used Laurent Pinchart
@ 2008-04-12 5:53 ` Jeff Garzik
0 siblings, 0 replies; 3+ messages in thread
From: Jeff Garzik @ 2008-04-12 5:53 UTC (permalink / raw)
To: Laurent Pinchart; +Cc: netdev, linuxppc-dev
Laurent Pinchart wrote:
> fs_enet_close() calls napi_disable() unconditionally. This patch skips the
> call when use_napi isn't set.
>
> Signed-off-by: Laurent Pinchart <laurentp@cse-semaphore.com>
> ---
> drivers/net/fs_enet/fs_enet-main.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
> index c83bd65..1801ce3 100644
> --- a/drivers/net/fs_enet/fs_enet-main.c
> +++ b/drivers/net/fs_enet/fs_enet-main.c
> @@ -835,7 +835,8 @@ static int fs_enet_close(struct net_device *dev)
>
> netif_stop_queue(dev);
> netif_carrier_off(dev);
> - napi_disable(&fep->napi);
> + if (fep->fpi->use_napi)
> + napi_disable(&fep->napi);
> phy_stop(fep->phydev);
applied
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-04-12 5:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-04-11 12:05 [PATCH] fs_enet: Don't call NAPI functions when NAPI is not used Laurent Pinchart
2008-04-12 5:53 ` Jeff Garzik
-- strict thread matches above, loose matches on Subject: below --
2008-02-28 15:36 Laurent Pinchart
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).