Sfoglia il codice sorgente

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>
Laurent Pinchart 17 anni fa
parent
commit
9a3c243d7d
1 ha cambiato i file con 2 aggiunte e 1 eliminazioni
  1. 2 1
      drivers/net/fs_enet/fs_enet-main.c

+ 2 - 1
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);