From: Nathan Fontenot <nfont@linux.vnet.ibm.com>
To: netdev@vger.kernel.org
Cc: brking@linux.vnet.ibm.com, jallen@linux.vnet.ibm.com,
muvic@linux.vnet.ibm.com, tlfalcon@linux.vnet.ibm.com
Subject: [PATCH v3 net-next 04/11] ibmvnic: Delete napi's when releasing driver resources
Date: Tue, 02 May 2017 14:52:35 -0400 [thread overview]
Message-ID: <20170502185235.28214.26438.stgit@ltcalpine2-lp23.aus.stglabs.ibm.com> (raw)
In-Reply-To: <20170502185006.28214.89072.stgit@ltcalpine2-lp23.aus.stglabs.ibm.com>
The napi structs allocated at drivier initializatio need to be
free'ed when releasing the drivers resources.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
---
drivers/net/ethernet/ibm/ibmvnic.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index b3d9b28..9f2686d 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -552,11 +552,20 @@ static int ibmvnic_login(struct net_device *netdev)
static void release_resources(struct ibmvnic_adapter *adapter)
{
+ int i;
+
release_tx_pools(adapter);
release_rx_pools(adapter);
release_stats_token(adapter);
release_error_buffers(adapter);
+
+ if (adapter->napi) {
+ for (i = 0; i < adapter->req_rx_queues; i++) {
+ if (&adapter->napi[i])
+ netif_napi_del(&adapter->napi[i]);
+ }
+ }
}
static int set_link_state(struct ibmvnic_adapter *adapter, u8 link_state)
next prev parent reply other threads:[~2017-05-02 15:03 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-02 18:52 [PATCH v3 net-next 00/11] ibmvnic: Updated reset handler and code fixes Nathan Fontenot
2017-05-02 18:52 ` [PATCH v3 net-next 01/11] ibmvnic: Move resource initialization to its own routine Nathan Fontenot
2017-05-02 18:52 ` [PATCH v3 net-next 02/11] ibmvnic: Replace is_closed with state field Nathan Fontenot
2017-05-02 18:52 ` [PATCH v3 net-next 03/11] ibmvnic: Updated reset handling Nathan Fontenot
2017-05-02 18:52 ` Nathan Fontenot [this message]
2017-05-02 18:52 ` [PATCH v3 net-next 05/11] ibmvnic: Whitespace correction in release_rx_pools Nathan Fontenot
2017-05-02 18:52 ` [PATCH v3 net-next 06/11] ibmvnic: Clean up tx pools when closing Nathan Fontenot
2017-05-02 18:52 ` [PATCH v3 net-next 07/11] ibmvnic: Wait for any pending scrqs entries at driver close Nathan Fontenot
2017-05-02 18:52 ` [PATCH v3 net-next 08/11] ibmvnic: Check for driver reset first in ibmvnic_xmit Nathan Fontenot
2017-05-02 18:53 ` [PATCH v3 net-next 09/11] ibmvnic: Continue skb processing after skb completion error Nathan Fontenot
2017-05-02 18:53 ` [PATCH v3 net-next 10/11] ibmvnic: Record SKB RX queue during poll Nathan Fontenot
2017-05-02 18:53 ` [PATCH v3 net-next 11/11] ibmvnic: Move queue restarting in ibmvnic_tx_complete Nathan Fontenot
2017-05-02 19:49 ` [PATCH v3 net-next 00/11] ibmvnic: Updated reset handler and code fixes David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170502185235.28214.26438.stgit@ltcalpine2-lp23.aus.stglabs.ibm.com \
--to=nfont@linux.vnet.ibm.com \
--cc=brking@linux.vnet.ibm.com \
--cc=jallen@linux.vnet.ibm.com \
--cc=muvic@linux.vnet.ibm.com \
--cc=netdev@vger.kernel.org \
--cc=tlfalcon@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox