diff options
| author | Laurent Pinchart <laurentp@cse-semaphore.com> | 2008-04-11 14:05:50 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-04-12 01:52:38 -0400 |
| commit | 9a3c243d7d87f401682247dbeff94067d814c192 (patch) | |
| tree | 810f3c35eb70b4197f8f57113b686402e5e6d25a /drivers/net/fs_enet | |
| parent | c63eddb200690023e7c67f4dd9f132ad91660517 (diff) | |
| download | linux-9a3c243d7d87f401682247dbeff94067d814c192.tar.gz linux-9a3c243d7d87f401682247dbeff94067d814c192.tar.bz2 linux-9a3c243d7d87f401682247dbeff94067d814c192.zip | |
fs_enet: Don't call NAPI functions when NAPI is not used.
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>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/fs_enet')
| -rw-r--r-- | 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 af869cf9ae7d..940e2041ba38 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); |