[PATCH] fs_enet: Don't call NAPI functions when NAPI is not used.

Jeff Garzik jgarzik at pobox.com
Sat Apr 12 15:53:53 EST 2008


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 at 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





More information about the Linuxppc-dev mailing list