From d2dedff2041d01b0402cd418f0ec52c7b512a6ae Mon Sep 17 00:00:00 2001 From: Ron Mercer Date: Mon, 2 Feb 2009 13:54:31 -0800 Subject: [PATCH] --- yaml --- r: 130876 b: refs/heads/master c: 0047e5d240ede4e84c03bc9001375175900fd259 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/qlge/qlge_main.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 26e238450fb1..19b87c7c7940 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e78f5fa7cc1a211eb9909ef90b0de3311086ba55 +refs/heads/master: 0047e5d240ede4e84c03bc9001375175900fd259 diff --git a/trunk/drivers/net/qlge/qlge_main.c b/trunk/drivers/net/qlge/qlge_main.c index c6c070475f07..3d1d7b6e55aa 100644 --- a/trunk/drivers/net/qlge/qlge_main.c +++ b/trunk/drivers/net/qlge/qlge_main.c @@ -3836,7 +3836,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; + int err, i; netif_device_detach(ndev); @@ -3846,6 +3846,9 @@ 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;