Skip to contentSkip to conversation

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

PATCH New Laurent Pinchart 1 participant 1 message Feb 28, 2008 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 drivers/net/fs_enet/fs_enet-main.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
(quoted diff) +0 -0

b/drivers/net/fs_enet/fs_enet-main.c
index c83bd65..1801ce3 100644

drivers/net/fs_enet/fs_enet-main.c +2 -1
@@ -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);
Signature · 12 lines
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