Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b318cb3 authored by Ron Mercer's avatar Ron Mercer Committed by David S. Miller
Browse files

qlge: bugfix: Move netif_napi_del() to common call point. 



Moving netif_napi_del() up the call chain so it will get called from all
exit points.

Signed-off-by: default avatarRon Mercer <ron.mercer@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 39a28bc4

drivers/net/qlge/qlge_main.c

+6 −4
Original line number Diff line number Diff line
@@ -3236,6 +3236,11 @@ static int ql_adapter_down(struct ql_adapter *qdev) 


	ql_tx_ring_clean(qdev);



	/* Call netif_napi_del() from common point.

	 */

	for (i = qdev->rss_ring_first_cq_id; i < qdev->rx_ring_count; i++)

		netif_napi_del(&qdev->rx_ring[i].napi);



	ql_free_rx_buffers(qdev);

	spin_lock(&qdev->hw_lock);

	status = ql_adapter_reset(qdev);
@@ -3964,7 +3969,7 @@ static int qlge_suspend(struct pci_dev *pdev, pm_message_t state) 
{

	struct net_device *ndev = pci_get_drvdata(pdev);

	struct ql_adapter *qdev = netdev_priv(ndev);

	int err, i;

	int err;



	netif_device_detach(ndev);
@@ -3974,9 +3979,6 @@ static int qlge_suspend(struct pci_dev *pdev, pm_message_t state) 
			return err;

	}



	for (i = qdev->rss_ring_first_cq_id; i < qdev->rx_ring_count; i++)

		netif_napi_del(&qdev->rx_ring[i].napi);



	err = pci_save_state(pdev);

	if (err)

		return err;